tree 77695280646ade632e2ebbf72c621622d5ae3e5c
parent a51da7900bf6cfa9242053eddef38af16a4e20d0
parent 3d0216caa5a8b73bc9099bd4e8d21b367eee97de
author Steve Elliott <steell@google.com> 1574358517 -0800
committer android-build-merger <android-build-merger@google.com> 1574358517 -0800

[automerger skipped] Merge "DO NOT MERGE: Properly reflect device lock state in Global Action panel." into qt-qpr1-dev am: 893a2b05a5
am: 3d0216caa5 -s ours
am skip reason: subject contains skip directive

Change-Id: I0d3dedbffeaf6d21228f69297e63afb785af7160