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

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