Merge "Update strings in dialogs" into tm-qpr-dev am: b766fb53 am:...

Merge "Update strings in dialogs" into tm-qpr-dev am: b766fb53 am: eec5d9ee am: 4af761f2 am: eb1f56c2

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



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