Merge "Vapex vintf fragments are part of vendor manifest" into main