[automerger skipped] Merge "change getActiveAndHiddenSubscriptionInfoList API...

[automerger skipped] Merge "change getActiveAndHiddenSubscriptionInfoList API name" into rvc-dev am: 8ca61d7c am: 1e73fbea am: 6a6c254d am: 21feb761 -s ours am: 40139351 -s ours

am skip reason: Change-Id I6202c4039d858ccfed1d09e8b315d701bb571ccf with SHA-1 40468064 is in history

Change-Id: I8c5ccfecb6144c07a514a598426a69a85b723dd5