Merge "migrate keyguard disabled features" into udc-dev am: e4b09c22 am: 2dc45e47

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



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