[automerger skipped] Merge "Don't return hidden subscription in getActiveSubIdList" am: 630823a671 am: 18dd2f5824
am: cc2b7cac62 -s ours
am skip reason: change_id Ic208ab93dbaba78d359a66594be9d87b56560c3a with SHA1 8e0a13e0a6 is in history

Change-Id: I2a40461e155e43779f5777b6aac51d71a95d0832