[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: 7997f969 am: 116aaf4e am: 8e634d22 -s ours

am skip reason: subject contains skip directive

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



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