Merge "Fix cell data preference in single sim case" into nyc-dev am: 04f10a5
am: e0ec32c

* commit 'e0ec32c26e580b5dca8c1968f20949021d37211f':
  Fix cell data preference in single sim case

Change-Id: I317173dde03aac9d5b5ac0ec9805347a069a6086