[automerger skipped] Merge "Make some SubscriptionManager APIs system APIs" am: 755f2a38ac am: ca9ce0df60
am: 945180736b  -s ours

Change-Id: I1246a81a8fa498a74a3856a3738d24270750682a