[automerger skipped] RESTRICT AUTOMERGE Replace all references to the new...

[automerger skipped] RESTRICT AUTOMERGE Replace all references to the new strings with a pre-existing string am: c5dca40d am: f697a199 -s ours

am skip reason: Merged-In Iecd0215b70ed2b66bdf1b3a9431bb03275911bac with SHA-1 c5dca40d is already in history

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



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