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: 73a8fd61

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



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