Merge "Fix typo in string" into tm-qpr-dev am: 71f37c99 am: e58bacfa am: eb54686d am: c277906d

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



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