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

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

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