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

Change-Id: I40195cc5643262d310a45c89d1751aa8f6c89f1e