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

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



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