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

Change-Id: Ie545be9a03278ddb75e404ebe92194d6f9312120