Merge "Merge "Considered network preference when simulating legacy data RAT" into qt-dev am: 3759c04e am: 65d3a07a" into qt-r1-dev-plus-aosp