[automerger skipped] Merge "Allow unlocked in VTS" into rvc-dev am: ff07d31be0 -s ours am: 2ef2df9a27 -s ours am: 1c1ffb4125 -s ours

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

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

Change-Id: Ie252cce7aaf6195107e3eb3f8350c2da07dce967