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

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



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