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