[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 86c03af303 -s ours am: d2eefd4d9c -s ours am: f088512a6d -s ours

am skip reason: Merged-In I6f6846ae6976af732218463440330e32a0d5a3c7 with SHA-1 a7abeebdfd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/test/vts-testcase/hal/+/16281176

Change-Id: I755604bafcd1764348d6129d91976fe4f78425be