[automerger skipped] Merge "Allow unlocked in VTS" into rvc-dev am: ff07d31b...

[automerger skipped] Merge "Allow unlocked in VTS" into rvc-dev am: ff07d31b am: 412ee58e -s ours am: c2c90425 -s ours am: 9482be28 -s ours

am skip reason: Change-Id If5a90d62f77489aa58f96e908553a052cf6d1e18 with SHA-1 307d2bba is in history

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

Change-Id: I01d0d0b223cc2c0281c40d750fc8cbc1f5ba9304