Merge "Remove usage of hidden API subscriptionManager.isSubscriptionVisible" am: 11202f37c3 am: d1002509c2
am: 3c843e062f

Change-Id: I3a5985f8c5fc04f65e12d2b6e85a5b770532d8fc