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

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

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

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