[automerger skipped] Merge "Add helper API to hide subscriptions when getting active subscriptions" am: 795b80da15 am: bf69949739
am: bc5ee3e1db -s ours
am skip reason: change_id Ib69f1c2c51d22c2a58cfa93c662dc65521f7874f with SHA1 a0633d01ec is in history

Change-Id: Id52873b1cd61db81903e4325bb5a3e7b2fae75ac