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

Change-Id: Id34a3b5da71400c651e3a05198210acae155067c