Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
am: 22f0dfcff5

Change-Id: I8a0cad0e372b39ce237e9ff82f959e0d4b3f05dd