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: Ieb37cc4bd9782d3f3f319b2f21687b208bea1e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>