Merge "VTS: Restore 2nd-IMEI tests" am: a3bc09e02a

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

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