Merge "Make NetworkSettings and NetworkQueryService multi-sim aware." into mnc-dev