Merge "Merge "Support talkback with new Udfps Overlay on keyguard" into...

Merge "Merge "Support talkback with new Udfps Overlay on keyguard" into udc-dev am: 2c934288 am: 6449de95" into udc-d1-dev-plus-aosp am: f45d96c0

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



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