Merge "Make SubscriptionManager.isActiveSubId public" am: fafc51a088 am: a4107d39ad
am: 0e4e2ef977

Change-Id: I0be229aa047817b13978f118fbf0d3e415b150f8