Merge "KM VTS test fix - handled "null" value for imei." am: 95ec2cdd2f am: 6b4a8807a5

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

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