[automerger skipped] DO NOT MERGE: Properly reflect device lock state in...
[automerger skipped] DO NOT MERGE: Properly reflect device lock state in Global Action panel. am: db386ab0
am: afe77db9 -s ours
am skip reason: subject contains skip directive
Change-Id: I96808898534d802925103e11da08e1cc92fef04f