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 am: 2607e3b2

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



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