[automerger skipped] RESTRICT AUTOMERGE Add activeUnlock config to force dismissKeyguard am: 0011ed15 am: ee56b49f -s ours

am skip reason: subject contains skip directive

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



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