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

Change-Id: I7a1ca4361398301b9d80c44bfed57d868790ea37