[automerger skipped] Merge "DO NOT MERGE: Update base layouts to match R" into qt-car-dev am: d3bf1c49a1 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/libs/+/12052981

Change-Id: I7230e2175b68a9880c59738feaf5dd2ed11219d1