Merge "Cleaning androidx:car-car dependencies"