[automerger skipped] Merge "Considered network preference when simulating...
[automerger skipped] Merge "Considered network preference when simulating legacy data RAT" am: d40f7dc4
am: 6581f25f -s ours
am skip reason: change_id Ifdddad1d5ee95f4576d5002a1b66caafc172cb58 with SHA1 a74f2d8c is in history
Change-Id: I65006cd7f5cc60dde27bbe7300bf1f2ac961db3d