Merge "Update active unlock triggers" into tm-dev am: f996e82e

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



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