Merge "(Cherry-pick from internal) Adapt test to change internal API...
Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList" am: 664ac2eb am: f9dd9dfd am: d3a80330
Change-Id: Iece4ab122985a837795635c20a93de06b2b8adfe