Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList"
am: 664ac2ebd7

Change-Id: I646975373dc24244074f761638919239276dbe61