Merge "Add hwservicemanager vintf fragments to system_ext" into main