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