Merge "Require READ_PHONE_STATE for getNetworkType"
am: 4fd50fee25

Change-Id: I6ad6165c51536f0d6ac2812bdc094798185dcf51