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

Change-Id: I3a07a7e1f1e95aafe1f50f4f33f50c01ba2454fd