Merge "[automerger skipped] Merge "Allow unlocked in VTS" into rvc-dev am: ff07d31be0 am: 412ee58e8a am: ae9c9ab3b7 -s ours" into rvc-qpr-dev-plus-aosp