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

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

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

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