[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 63a48b526b -s ours

am skip reason: Merged-In Ic9f51474fac5a87265660340a8bf91b250c33887 with SHA-1 a80ba29852 is already in history

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

Change-Id: I94b7a235c80c07233baa8a9d31eb9e6cfb180e9f