Merge "Conditionally add the car bcpf to platform bootclasspath" am: 18f0a04eb8 am: 8076a6a0d3 am: 75fa8c900f

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

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