Merge "[Telephony Mainline] Change SubscriptionManager.CONTENT_URI to SIM_INFO_CONTENT_URI for mainline" am: 11cdd4614a am: 8730bfbd1b

Change-Id: I95c412fb306fb5c185b9df5793bff3d8d5a608b9