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

Change-Id: I5256c7b22e1014b37b6970aa3376467ed577aed6