[coastguard skipped] Merge sparse cherrypicks from sparse-9380938-L19200000957686535 into tm-release. am: 7437cf97d9

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

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