Merge "Require READ_PHONE_STATE for getNetworkType in R+"
am: ddebdb46c2

Change-Id: Ia7b079d61ab5af1abe374e9efb3e7e1d8f562c50