Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev am: 5110b31dda
am: 3cb54e4aaa

Change-Id: I13032f8c54094cb36ac2d842b6345ae0bdd78a33