Merge "Add helper API to hide subscriptions when getting active subscriptions" am: 795b80da15
am: bf69949739

Change-Id: I72be96cb0fddb2ad820e015f680519a0520de02b