Merge "Added iccid into the debug message" into udc-dev am: 652e98da am: 608ed4fa

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



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