[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into...

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

am skip reason: subject contains skip directive

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

Change-Id: Ibf4efdbbf64971bbc6d05b36b32dd6479c5ee18a