Merge "Make SubscriptionManager.isActiveSubId public"
am: fafc51a088

Change-Id: Ieb279a347a42dadefc2fdb3bbea99d455a69a7cb