am 4896c2b4: am 702360e9: am 2e0cdc90: am e266deb4: am 0cb6eefa: Merge "Make NetworkSettings and NetworkQueryService multi-sim aware." into mnc-dev

* commit '4896c2b4b27471988e93f0137c4b5bbb39600545':
  Make NetworkSettings and NetworkQueryService multi-sim aware.