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

Merge "KM VTS test fix - handled "null" value for imei." am: 95ec2cdd am: 6b4a8807 am: 64369644

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



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