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

* commit '702360e9394c2a57b897e44ec4f64386ce70dfae':
  Make NetworkSettings and NetworkQueryService multi-sim aware.