[automerger skipped] Merge "Don't return hidden subscription in getActiveSubIdList" am: 5fc47b3e am: f52d693f
am: 1738ca26 -s ours
am skip reason: change_id I448b95c42062295d8dede97b4a57f6973b14c7d9 with SHA1 7112f6f2 is in history
Change-Id: I6e75a0583e4bf89a6a9c259ddf5d7a71e0317110