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: 3fd256ed am: caf0cc5b

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



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