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
Change-Id: Idd566f53353a083093ad4ebd15c8289244acce36