[automerger skipped] Merge UP1A.230905.019 am: ece177a9 -s ours am:...

[automerger skipped] Merge UP1A.230905.019 am: ece177a9 -s ours am: b1551d65 -s ours am: 8af0aaab -s ours am: 620da10d -s ours

am skip reason: Merged-In Id4909881f9f6ac509c60889557652632f00a8523 with SHA-1 fd39f04d is already in history

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



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