tree 18d17ab79a39f341b50f8eb4376488d9e836f2fe
parent a2fc3e6520819645d61f4388be12c530efffe00f
parent 9cd510cb2193da7620ddfa3339d01755f8e1758f
author Sarah Chin <sarahchin@google.com> 1603476924 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603476924 +0000

[automerger skipped] Merge "Add MANAGE_SUBSCRIPTION_PLAN permission" am: cf4ccdd0f5 am: 9cd510cb21 -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: I6836554b1a5ebf0b75a9df34de4a0923f64254a9