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

Change-Id: Id9b37d40c09fd27e405c13977925bf4beb37175f