Merge "Rename com.android.car.apitest package into android.cat.apitest" into nyc-car-dev