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

Change-Id: Ifca1ad29ce283d083619c5d0f11cb02d246007d6