[automerger skipped] Update to use androidx.car
am: b4839c5ab6  -s ours

Change-Id: Iaf6d702590e3f534909ec1660b7373fd129b2ec8