Merge changes I16f94ee3,I071fdb62 into main am: e12193c1 am: e8c7b614

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



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