Merge "Add APIs to indicate which subscriptions should be hidden from user" am: 00baab3d29
am: 477d3989d3

Change-Id: I159f2fa823f93ba8540dfa8ef5367b7b813cfee1