Merge "Add feature flag for new keyguard dismiss refactor" into udc-dev am:...

Merge "Add feature flag for new keyguard dismiss refactor" into udc-dev am: 84fd6c78 am: 5eb70ca0

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



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