Merge "Update the CarSupportLib SDK target to 23" into nyc-car-dev