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

Change-Id: I02a639b00d9ca22870b831cd9abd3347eb1e0d70