[automerger skipped] Merge "Require READ_PHONE_STATE for getNetworkType" am: 4fd50fee25
am: adf354bd0b -s ours
am skip reason: change_id I1b47502c9c1ffd4ecec2db548bbdd89d668bd68f with SHA1 9042f0b9ee is in history

Change-Id: Ic792d97facbfaa5b7181ebea3047705df0b2c2ef