Merge cherrypicks of [20084105] into rvc-platform-release. am: 9db28054d2

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

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