[automerger skipped] Merge "RESTRICT AUTOMERGE Add activeUnlock config to...

[automerger skipped] Merge "RESTRICT AUTOMERGE Add activeUnlock config to force dismissKeyguard" into tm-qpr-dev am: 9070618c am: e85df30e -s ours

am skip reason: subject contains skip directive

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



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