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

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