Merge "Change permission of getPreferredNetworkType" am: 59c34ab97f
am: 81309a6781

Change-Id: I25f2e247921cfb2bd3e4072afcd216f15c1a510f