Update VTS tests so that more tests pass for O.

Cherry picked from ag/2562201
Bug: b/62926561
Test: vts tests

Change-Id: Ic927f9efd437c6411fb14feac8c681334e4b5e60
Merged-in: Ic927f9efd437c6411fb14feac8c681334e4b5e60
5 files changed