RC: Reorder Power Menu options based on actual ordering

Order now reflects how they are presented in the actual power menu
Also clean up some whitespace at EOF

Change-Id: If6c462b3ee226c327025fa98ea16a22847377793
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>