Merge "VTS: Restore 2nd-IMEI tests" am: a3bc09e02a am: d0c6ea094d am: d1d3192505 am: 0da122adb4 am: 06ccd218c7

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

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