[automerger skipped] Merge "Ensure we don't record 0 MCC/MNC." into udc-dev...

[automerger skipped] Merge "Ensure we don't record 0 MCC/MNC." into udc-dev am: ff7845ea am: f29d82ad -s ours

am skip reason: Merged-In I532e2b97f7fb9337850613d56f70cfd3377462f0 with SHA-1 08165b90 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23582662



Change-Id: I6b718731b566f416938fc17df378b4903da3b98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>