[automerger skipped] Merge "Add MANAGE_SUBSCRIPTION_PLAN permission" am: cf4ccdd0f5 am: 9cd510cb21 -s ours am: 3b46f0135f -s ours am: 0f2e5f41fd -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: I3795d2056530e5837d23b962f8ef203cb422037f