Merge "[Telephony Mainline] Expose APIs in SubscriptionManager" am: 9fb53792ac am: 8116176ea6

Change-Id: Iefd563d6e153a045e5fd2d66f168e9ebf7a5c73d