Merge "Disable expanded udfps overlay in enrollment when using talkback" into...

Merge "Disable expanded udfps overlay in enrollment when using talkback" into udc-dev am: 903df7dc am: 1e499475

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



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