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

Merge changes I16f94ee3,I071fdb62 into main am: e12193c1 am: e8c7b614 am: 44b682d0 am: 103c19aa am: 6b9ed7e1

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



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