[automerger skipped] Merge "[DO NOT MERGE] Trigger lockNow() via a broadcast" into oreo-mr1-cts-dev am: c853ab8038 -s ours am: 97c9c5d5d7 -s ours am: 8fdb436b42 -s ours am: c9c324051e -s ours

am skip reason: Change-Id Ib380fde4cb6376cacfd589a254398e1688868e54 with SHA-1 9348c7db0c is in history

Change-Id: Id311d97b1f2b66e12826b5f4ae68899cf206b0ae