[automerger skipped] Merge changes I3a7cbcda,If99f0873,I8567714c,I35510311 into main am: 97402b0c am: 50002d93 -s ours am: c72a8d88 -s ours

am skip reason: Merged-In I3a7cbcdadf30660b73611d13e1fdd8d2cc781f01 with SHA-1 144da62e is already in history

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



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