[automerger skipped] Merge Android U (ab/10368041) am: 9341caa1b2 -s ours am: 1eff5c419e -s ours am: 56fc91da3f -s ours am: f81782bdb1 -s ours

am skip reason: Merged-In Ifec453245267ea9b6ba641077776e26fd041747d with SHA-1 bf1e28a69d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/24182854

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