[automerger skipped] Merge "Update code to match new CarUiRecyclerView design" into sc-v2-dev am: 1c9a57a939 -s ours

am skip reason: Merged-In I835f63773a5083df321ca667027d4f20ea9349fd with SHA-1 ad69935f81 is already in history

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

Change-Id: Ia5bfaa7a0d384b94426920dc11cae53bcd6ed1e5