Merge "Handle NullPointerException during getIccId" into tm-dev am: 03083c8f am: d886ef30 am: 8109f10c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18672138



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