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

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

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