am 1ea014e7: (-s ours) am 0cb6eefa: Merge "Make NetworkSettings and NetworkQueryService multi-sim aware." into mnc-dev

* commit '1ea014e7661ffc2ecbc2121f83f8e41b276f6e0a':