Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline" am: e74c1f12 am: fe520a75 Change-Id: I03f3023ad48b2663c58234ede2deefd0ea80a881