[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: 72020350 -s ours

am skip reason: Merged-In I035e4560d8368e3677f516dce063b90ea2ed1cf4 with SHA-1 9bdd5a17 is already in history

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

Change-Id: I8dca341694dc18fef189d5e3af30b3105d1d4dfa