Merge "DO NOT MERGE Modified to use ANDROID_SUPPORT_CAR_TARGETS." into pi-dev
am: db08eb7e38

Change-Id: I641f0d759bbf34bfe4b91376a53d58771a7624a5