Merge "Fix incorrect talkback text for non-sfps devices" into udc-dev am:...

Merge "Fix incorrect talkback text for non-sfps devices" into udc-dev am: 2c9791ff am: f3360c3d am: 74fa9f63 am: 8f8ee14b

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



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