Merge "KM VTS test fix - handled "null" value for imei." into udc-dev am: 0b48df3a am: 65ef069d

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23244643



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