Merge "Conditionally add the car bcpf to platform bootclasspath" am: 18f0a04e am: 8076a6a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378892



Change-Id: I3cfdf3c67da32b4d2c83a1f7e57b0a5544bbf4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>