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