[automerger skipped] Merge "DO NOT MERGE Modified to use ANDROID_SUPPORT_CAR_TARGETS." into pi-dev am: db08eb7e38
am: e89622d0be  -s ours

Change-Id: I392744c1c97443fd4f3bd627f8b4e81734394b0b