Fix error where android-support-car is depending on an androidx target.
am: 5ff078c5e2

Change-Id: If325fa6ac2ce33aa3459fa3309111cb7434ce03b