Merge "vts_treble_no_hidl check vintf instead of hwservicemanager" into main