tree 77695280646ade632e2ebbf72c621622d5ae3e5c
parent de887b35a64b9a8815115ca900e8e6fdad7b54ec
parent afe77db9e49e58459ae93c00a12ec3bd2955f149
author Steve Elliott <steell@google.com> 1574358339 -0800
committer android-build-merger <android-build-merger@google.com> 1574358339 -0800

[automerger skipped] DO NOT MERGE: Properly reflect device lock state in Global Action panel. am: db386ab068
am: afe77db9e4 -s ours
am skip reason: subject contains skip directive

Change-Id: I96808898534d802925103e11da08e1cc92fef04f