Merge "Change permission of getPreferredNetworkType"
am: 59c34ab97f

Change-Id: I7a2e650e3d947a5c51b2b6a5553ec9b77a0b6fa3