tree b6a8d66d8cda52e3ae7a9410b201d4339e938244
parent 84b311d3a2de2be79ec307945335f1c637c2d00b
author Jack Yu <jackyu@google.com> 1560362416 -0700
committer Jack Yu <jackyu@google.com> 1560816973 -0700

Fixed incorrect merge service state

The existing logic for merging service state when device is on
IWLAN does not work properly on AP-assisted mode devices. Fixed
by copying the IWLAN preferred flag into IMS service state so
it can get the correct data RAT for AP-assisted mode devices.

Bug: 134706530
Test: WFC manual tests
Merged-In: Ic18934adb870a0114c913855cdb68e0ef33caa79
Change-Id: Ic18934adb870a0114c913855cdb68e0ef33caa79
(cherry picked from commit 5e640ac80e3b457cb2054d50f6892513a4b78b06)