Improve OpenAfterOpen VTS test am: 8d3cb52ead am: f9a0c1cf56

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

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