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

Change-Id: I9a09aae1a3fe9957f8568af85c4f5ed1773b50f8