[automerger skipped] DO NOT MERGE Update active unlock triggers take #2 am:...

[automerger skipped] DO NOT MERGE Update active unlock triggers take #2 am: fe7e9e9a am: 406aaa18 -s ours

am skip reason: subject contains skip directive

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



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