[automerger skipped] Merge "Fix name in string constants" am: 9c67a28e am:...

[automerger skipped] Merge "Fix name in string constants" am: 9c67a28e am: 270bdb94 am: 3dd6a5e4 -s ours am: e5686a91 -s ours

am skip reason: Merged-In Ie3d0ef7ea15205ccad423fa94102d05d16756878 with SHA-1 69c60c05 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2034105

Change-Id: I0b7c59406189e16a22dd2b03c3cd07ac25d767c9