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

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



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