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

Change-Id: I3f4d6d11ab56dcd4fc771a9db8da57ad3733d889