Merge "[automerger skipped] Merge "Make some SubscriptionManager APIs system APIs" am: 755f2a38 am: ca9ce0df am: 94518073 -s ours"