Merge "Reland "Set vendor: true for boot control HAL""