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

Change-Id: I82b7fb6bc38e75315be2289b47ac265b70d8b649