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

Change-Id: If3332f86e1718c8d7c05464a28ed1d8688ceeec1