Log both the network and SIM MCC-MNC values.

* Previous schema will be a no-op.
* Follows on the heels of I10cd15cfb5a1625159e6ac2151938d3b24710e90 on Android.
* iOS patch coming later.

Change-Id: Ibf43f65fe2ff2b7b31fcea44e860e0e45f240a96
Merge "Log both the network and SIM MCC-MNC values."