tree c7b93e7ce1ccb1a739bc7cb09da0f2bb0e4ce374
parent 1139a24d8689b1fa4ee1fac459ca32c803b87038
parent 028919568629d0ea19364b4b68f72bac811bd9e1
author Xin Li <delphij@google.com> 1648976930 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648976930 +0000

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c603b9ee04 -s ours am: b73915c759 -s ours am: d209f178b3 -s ours am: 0289195686 -s ours

am skip reason: Merged-In Ifbde02097b69fe59cc267d6bca0c55b4d5c82f67 with SHA-1 776e0b4108 is already in history

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

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