[automerger skipped] Merge "Fixed incorrect data network type when device is...
[automerger skipped] Merge "Fixed incorrect data network type when device is on IWLAN" am: e8eb9673 am: cfd6493b
am: 55d3fb8a -s ours
am skip reason: change_id I37256517af3bcf7330cefe55a33d6f09af7e1353 with SHA1 2bd03207 is in history
Change-Id: I4c2489b877cf98f7e11bfff3164c671d73f27f90