Improve OpenAfterOpen VTS test am: 8d3cb52ead am: f9a0c1cf56 am: 09b530ad16

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

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