tree 9b1f6d43146998597cc474b465efcd10038bb274
parent b9d022b13b1e57fb46bdacb723c8fd087d633fe2
parent 4b6bd903c54a7f7c675b9c8d304fd420ee9d33c5
author TreeHugger Robot <treehugger-gerrit@google.com> 1637144452 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637144452 +0000

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 168f683a81 -s ours am: ba56475ea3 -s ours am: 4b6bd903c5 -s ours

am skip reason: Merged-In I0f22bb6e4c1f1d48375844861881ad139d6646aa with SHA-1 619bb99665 is already in history

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

Change-Id: I72405391872d0602b4314e351304bb8aecdb7f1c