Merge "Make back button dismiss power dialog, by making dialog focusable."...
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev am: 5110b31d am: 3cb54e4a
am: 0932b32a
Change-Id: I4f704a7ab817410885d865cb7c0f3c815f904064