[automerger skipped] Merge "Merge Android U (ab/10368041)" into...

[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 9ab14f78 -s ours am: 31307995 -s ours am: dc9628af -s ours am: d9412355 -s ours

am skip reason: Merged-In I70d1294d44bdf2657201285b3e281aecda467507 with SHA-1 b0184374 is already in history

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



Change-Id: If73c773cd50c9404b9af4ef42f57491aec50e112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>