[automerger skipped] Merge changes I577dd4ec,I23db0581,I91993a8e,I05ad5e12...

[automerger skipped] Merge changes I577dd4ec,I23db0581,I91993a8e,I05ad5e12 into main am: 42943cab am: 531b485a -s ours am: b2399082 -s ours am: d564688f -s ours

am skip reason: Merged-In I577dd4ec13d053f52e388456a9639a6e6bd3b736 with SHA-1 a4950431 is already in history

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



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