[automerger skipped] Merge "Add APIs to indicate which subscriptions should be hidden from user" am: 00baab3d29 am: 477d3989d3
am: fdae9d3f01  -s ours

Change-Id: Icf5b03d0f129308408c0ac2230ba33f4d34c1d40