[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: 17efd3ca -s ours am: bdbc2b3d -s ours

am skip reason: subject contains skip directive

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



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