Merge "Add MANAGE_SUBSCRIPTION_PLAN permission"