Merge "Quick affordance long-press failure string updated" into tm-qpr-dev am:...

Merge "Quick affordance long-press failure string updated" into tm-qpr-dev am: 6e00fa64 am: 6176ef97

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



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