When logging MCC-MNC, get both network and SIM.
When logging MCC-MNC, get both network and SIM.

* There can be mismatches (e.g., roaming), so just send both.
* This will be a server no-op until server code is updated. No dependency.

Change-Id: I10cd15cfb5a1625159e6ac2151938d3b24710e90

creaITve/apps-android-tbrc-works,parvez3019/apps-android-wikipedia,parvez3019/apps-android-wikipedia,parvez3019/apps-android-wikipedia,dbrant/apps-android-wikipedia,Duct-and-rice/KrswtkhrWiki4Android,SAGROUP2/apps-android-wikipedia,dbrant/apps-android-wikipedia,dbrant/apps-android-wikipedia,SAGROUP2/apps-android-wikipedia,BrunoMRodrigues/apps-android-tbrc-work,dbrant/apps-android-wikipedia,creaITve/apps-android-tbrc-works,dbrant/apps-android-wikipedia,carloshwa/apps-android-wikipedia,carloshwa/apps-android-wikipedia,anirudh24seven/apps-android-wikipedia,Duct-and-rice/KrswtkhrWiki4Android,SAGROUP2/apps-android-wikipedia,reproio/apps-android-wikipedia,reproio/apps-android-wikipedia,BrunoMRodrigues/apps-android-tbrc-work,Wikinaut/wikipedia-app,anirudh24seven/apps-android-wikipedia,wikimedia/apps-android-wikipedia,Wikinaut/wikipedia-app,carloshwa/apps-android-wikipedia,wikimedia/apps-android-wikipedia,BrunoMRodrigues/apps-android-tbrc-work,reproio/apps-android-wikipedia,anirudh24seven/apps-android-wikipedia,creaITve/apps-android-tbrc-works,carloshwa/apps-android-wikipedia,Wikinaut/wikipedia-app,parvez3019/apps-android-wikipedia,creaITve/apps-android-tbrc-works,Wikinaut/wikipedia-app,anirudh24seven/apps-android-wikipedia,wikimedia/apps-android-wikipedia,parvez3019/apps-android-wikipedia,reproio/apps-android-wikipedia,SAGROUP2/apps-android-wikipedia,Duct-and-rice/KrswtkhrWiki4Android,Duct-and-rice/KrswtkhrWiki4Android,BrunoMRodrigues/apps-android-tbrc-work,carloshwa/apps-android-wikipedia,reproio/apps-android-wikipedia,SAGROUP2/apps-android-wikipedia,wikimedia/apps-android-wikipedia,Wikinaut/wikipedia-app,anirudh24seven/apps-android-wikipedia,Duct-and-rice/KrswtkhrWiki4Android