[automerger skipped] Merge "DO NOT MERGE Update active unlock triggers take #2" into tm-dev am: d9803be1 am: 526e0680 am: 6acdf3f5 am: 4af2ff82 -s ours

am skip reason: subject contains skip directive

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



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