Merge cherrypicks of [20084105] into sc-platform-release. am: 1bcda24420

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/20455472

Change-Id: I6c3f75eb088e8a6d379c768fe5a6294970966588
Signed-off-by: Automerger Merge Worker <[email protected]>