am f2309752: am 1ea014e7: (-s ours) am 0cb6eefa: Merge "Make NetworkSettings and NetworkQueryService multi-sim aware." into mnc-dev

* commit 'f23097527ddbdc51fe16b01a874d7b9b8d12f6e7':