[automerger skipped] RESTRICT AUTOMERGE Replace all references to the new strings with a pre-existing string am: c5dca40d am: 98eeb067 am: 9007298b -s ours am: 92b23ca5 -s ours

am skip reason: subject contains skip directive

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



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