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

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



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