[automerger skipped] Merge "KM VTS test fix - handled "null" value for imei."...

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

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

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



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