[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