[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: 0296f232 am: 60774da1 am: 393c80cc -s ours

am skip reason: subject contains skip directive

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



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