Merge "[automerger skipped] Merge "Fixed incorrect data network type when device is on IWLAN" am: e8eb967389 am: cfd6493bb8 am: 55d3fb8af4 -s ours am skip reason: change_id I37256517af3bcf7330cefe55a33d6f09af7e1353 with SHA1 2bd032071b is in history"