[automerger skipped] Merge "DO NOT MERGE Update active unlock triggers take...

[automerger skipped] Merge "DO NOT MERGE Update active unlock triggers take #2" into tm-dev am: d9803be1 am: 526e0680 am: 86a7b2a1 am: 65160b0b -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18005049



Change-Id: I2698380c8c637f2beaf9d2ff6b3ad9135e8ce7f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>