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

Change-Id: Icb122e8ec2a84e8caf2f3438805d232b019cac90