[automerger skipped] Merge "Considered network preference when simulating...
[automerger skipped] Merge "Considered network preference when simulating legacy data RAT" am: 1c25c6fa
am: 168938b3 -s ours
am skip reason: change_id Id53b018baed1f0f1dc1b959fbf3a857deeee37f1 with SHA1 a3775424 is in history
Change-Id: I352fe5e29d4694bf2fbfc64b0699b90e86149033