Merge cherrypicks of [19300570] into tm-release. am: f16039f7ab

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

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