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

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



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