RESTRICT AUTOMERGE Replace all references to the new strings with a pre-existing string

Bug: 282763277
Bug: 236891644
Test: everything builds, New strings are not part of the apk. verified by decompiling in AndroidStudio
Change-Id: Iecd0215b70ed2b66bdf1b3a9431bb03275911bac
Merged-In: Iecd0215b70ed2b66bdf1b3a9431bb03275911bac
4 files changed