Ensure MCC/MNC enrichment for sampling only happens on mdot API.

* bits was being hit first.
* Without this change, MCC/MNC would be sent, but not observed server-side.

Change-Id: I4172eb892daffd0148fcbbc3923c4fe8b54669e1
Merge "Ensure MCC/MNC enrichment for sampling only happens on mdot API."