Merge "Fixed incorrect data network type when device is on IWLAN" am: e8eb967389
am: cfd6493bb8

Change-Id: Ic611ac2efb3b56fef27f6ba441b22c58eca744a0