[automerger skipped] Merge "[Telephony Mainline] Change SubscriptionManager.CONTENT_URI to SIM_INFO_CONTENT_URI for mainline" am: 11cdd4614a am: 8730bfbd1b am: be9017e4e8 -s ours
am skip reason: Change-Id I302cf24e43dc258c812857412d177a825e498ea1 with SHA-1 004ecebc8c is in history

Change-Id: Ia1331b2ba929dfa2207404136710bad508242587