tree 45f10e3260e70079dd05ba044e9312e33ca4aead
parent afe77db9e49e58459ae93c00a12ec3bd2955f149
parent 893a2b05a5fc4067058212d9de406b7d29f38e72
author Steve Elliott <steell@google.com> 1574357994 -0800
committer android-build-merger <android-build-merger@google.com> 1574357994 -0800

Merge "DO NOT MERGE: Properly reflect device lock state in Global Action panel." into qt-qpr1-dev
am: 893a2b05a5

Change-Id: I1f1962ddf3a98f84b48934f78402eae7f7e5e64b