Make MCC-MNC logging honor Event Logging preference.

Change-Id: I106579380403352b6838cf21ddb9da80b874a6e1