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

Change-Id: I340af8aee92498660f7bc65cdf5540d37a2fa148