Merge "Fix CTS-V Mode Switch Test issue" into android12-tests-dev am: 117add00e9

Original change: https://android-review.googlesource.com/c/platform/cts/+/2412212

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