Merge "Don't return hidden subscription in getActiveSubIdList" am: d2cb5a0608
am: 851ec326d9

Change-Id: I9356cfd364f7a9d65c299a10d9aea37f1d3d79de