Merge "change getActiveAndHiddenSubscriptionInfoList API name" into rvc-dev am: 8ca61d7c am: 1e73fbea Change-Id: I3b38aaba1099b5e6b19fb1ba925a30add2c852a6