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: bf368a9b

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



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