[automerger skipped] Merge "Specify per-file owner for dimens_car.xml" into...

[automerger skipped] Merge "Specify per-file owner for dimens_car.xml" into sc-v2-dev am: 79b34ce9 -s ours am: 47c1a829 -s ours

am skip reason: Merged-In If0042d64c55484ae361fc08e785e74c026247553 with SHA-1 a6d0be3d is already in history

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

Change-Id: Ice2048ae7d2af55097f1570f1790fb61314fc1a6