Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)"