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

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

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