Merge "Make some SubscriptionManager APIs system APIs"
am: 755f2a38ac

Change-Id: Ib4c465ab263638d67c4c40831c1b44db2eccd25a