[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: 4c2b5546 am: eaf89805 am: a771bf18 -s ours

am skip reason: subject contains skip directive

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



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