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

[automerger skipped] Merge "Allow unlocked in VTS" into rvc-dev am: ff07d31b -s ours am: 2ef2df9a -s ours

am skip reason: Change-Id If5a90d62f77489aa58f96e908553a052cf6d1e18 with SHA-1 43dd6e34 is in history

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

Change-Id: I0089740b6f4e73f721c57f06a986493edda09dcf