Merge "Ensure we don't record 0 MCC/MNC." into udc-dev am: ff7845ea7e

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

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