Merge "Update uses of android-support-car to use androidx package."