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

Change-Id: I10a45b9636f27407dbab280da440f33545e0fdca