Merge "Deprecate VtsTrebleHidlShim test."