Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c am: 5401044873

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

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