otter2: Finalize fix up reboot into recovery

Change-Id: I928a54fecd50087c3524672d32d216751027a876
Revert "otter2: Disable reboot into recovery in advanced reboot menu"

This reverts commit 41f092faa91f63f924d8abf397adb0e76bfacfb7.

Change-Id: I1e3d6d32f2f7a73697bfb6068722847436d6fca7
Merge "otter2: Finalize fix up reboot into recovery" into cm-11.0
Merge "Revert "otter2: Disable reboot into recovery in advanced reboot menu"" into cm-11.0