[automerger skipped] Merge ab/7061308 into stage. am: 7b19a434 -s ours am:...

[automerger skipped] Merge ab/7061308 into stage. am: 7b19a434 -s ours am: 57dd4bb8 -s ours am: a5001ded -s ours

am skip reason: Change-Id I1c1476b3c802762798f30f7131b034b6e8a87d5e with SHA-1 b669cc50 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f588cef1edeb847127e7bd0326eb599001b0726