[automerger skipped] Merge Android U (ab/10368041) am: 0743a20a -s ours am:...

[automerger skipped] Merge Android U (ab/10368041) am: 0743a20a -s ours am: e5e1dce7 -s ours am: 3b4587af -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: I7e9f17f2f7f1c206028c076b3235928bb73af1ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>