[automerger skipped] Merge "KM VTS test fix - handled "null" value for imei." into udc-dev am: 0b48df3ad7 -s ours am: 2df7ac82bf -s ours

am skip reason: Merged-In Ia1569a30412d633eee4d4de8cd00dea077d1c23d with SHA-1 71d19b21c3 is already in history

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

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