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

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



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