Merge "use only android.Car in car service test" into nyc-car-dev