Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead SubscriptionManager.CONTENT_URI for mainline"
am: e74c1f1278

Change-Id: Iddf3d7c13d1d72a697a4bbf544e8e35659d8b2d1