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

Change-Id: Ibe948c63669c6da0ff4044152beaacaca8ac4a47