Merge "Merge "Convert PowerOptions menu into a dialog and update styling." into rvc-dev am: ee441db39f am: 8537f384e7" into rvc-d1-dev-plus-aosp