Bug: 274906319 Test: build pass Change-Id: Ic1b8cb6aec6c0ed48f3450d6e9db5a3aaf38f1c3
Bug: 242661555 Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test Change-Id: Ib017fec169933739063762af1ca5e2be1ba42d58