Merge "Fix incorrect talkback text for non-sfps devices" into udc-dev am: 2c9791ff am: 3fd256ed am: caf0cc5b am: 968fda32

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



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