tree eb7b2ff3c6f25fc932c0643e694b2a0a72e0d8dc
parent 89af11892772da1f33e4779e17d0e18ca8df94b8
parent 828a9c16f1faddf0af3ff2578c971d2fca08fd9c
author Xin Li <delphij@google.com> 1614076481 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614076481 +0000

[automerger skipped] Merge ab/7061308 into stage. am: f27f32c77e -s ours am: 828a9c16f1 -s ours

am skip reason: Change-Id I9dbd7774c5f46836d95af41b379552053d0d926c with SHA-1 212f35da6c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36077f535d4cfc8ffbde5786c526429bd0f6c2f9