Merge "[Telephony Mainline] Expose APIs in SubscriptionManager"
am: c0e02ab436

Change-Id: I8599664e033e579f18acf30203fa3ff9207122a2