[automerger skipped] Merge "DO NOT MERGE Update to use android-support-car...
[automerger skipped] Merge "DO NOT MERGE Update to use android-support-car instad of macro" into pi-dev am: a17b0642
am: bc9adef4 -s ours
Change-Id: I757a07bd7dca848dcda44358f47fe0a293b82ea7