Merge "Don't return hidden subscription in getActiveSubIdList"
am: 630823a671

Change-Id: I230a4954a57aa779dc2c15812c4a7c77142436b7