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: I7daf9d84aae383e3ac65c70494b8cbf92e33e3fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>