[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: 72020350 -s ours am: 248d5496 -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: I8ae67e804a375a5113d6af502d6dcda7a33d8939