[automerger skipped] DO NOT MERGE Update active unlock triggers take #2 am: fe7e9e9a am: 4c2b5546 am: f136101e am: d768cf4c -s ours

am skip reason: subject contains skip directive

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



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