Merge "DO NOT MERGE Update active unlock triggers take #2" into tm-dev am: d9803be1 am: 526e0680 am: 6acdf3f5

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



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