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

Change-Id: Iff157bac8d07cbf686089fbdaf8c58c17d10e527