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

am skip reason: subject contains skip directive

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



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