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

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



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