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

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



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