tree c4282836f134462ee6c15ae4afc322fc4787433a
parent 4155cfdd98d1dc2ccd4de50e1c3a75589d27c8d0
parent a1e5ac7164cbb4556226279de386518c5814c115
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1688170210 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1688170210 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23845447'] into udc-release. am: a1e5ac7164

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/23883952

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