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

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