[automerger skipped] Merge "Don't return hidden subscription in getActiveSubIdList" am: d2cb5a0608 am: 851ec326d9
am: 0a0213e493 -s ours
am skip reason: change_id I46ccae88167c2988d71a6e07da2937bf9644a1f0 with SHA1 d91d6b24f8 is in history

Change-Id: I1403c7600f08c2a5b6f4647d5d2844bf88a9ebe6