[automerger skipped] Merge "Considered network preference when simulating legacy data RAT" am: d40f7dc42e am: 6581f25fec -s ours
am: 4b413d99dd -s ours
am skip reason: change_id Ifdddad1d5ee95f4576d5002a1b66caafc172cb58 with SHA1 a74f2d8c34 is in history

Change-Id: I6edd958496d38503210eb2fea89d51967b52f9ab