[automerger skipped] Merge "Add permissions check for getNetworkType" am: 0c7239996d am: ab5273d7ce -s ours
am: c13b5519f8 -s ours
am skip reason: change_id I4e1767c9dc10acbadec286512752d4bb52059b74 with SHA1 39444b39ba is in history

Change-Id: I7148e0f57172e9438b364f9a9bf22c99c2f0d99f