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

Change-Id: Idf018a358f8c528697a20ebed7042f8cffef7963