tree ef2b2d38487b14ecbb578b5ebabd0725f520a042
parent 6dd9a25d8b0c31d83cf9f1c83b3de626bd2ae9ce
parent 3b46f0135f8f61399e5e791beebdeaab1b37c29d
author Sarah Chin <sarahchin@google.com> 1603478149 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603478149 +0000

[automerger skipped] Merge "Add MANAGE_SUBSCRIPTION_PLAN permission" am: cf4ccdd0f5 am: 9cd510cb21 -s ours am: 3b46f0135f -s ours

am skip reason: Change-Id I61963866fd34f28a3b15f727b5d07c38d6635a75 with SHA-1 f133750dcc is in history

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

Change-Id: Ia9ebd8a886bb16479647ee4f63b7ad77e71f35c4