[automerger skipped] Merge changes from topic "satlog" into 24D1-dev am: 878add45 -s ours

am skip reason: Merged-In I00fff6136c4f73a2b9eca22dfbea38474912a04d with SHA-1 a1e9d053 is already in history

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



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