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

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

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

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