Merge "Replace addItemDecoration with layout_margin" into sc-v2-dev am: 167d8eb263

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

Change-Id: I234560de46a28ad574549bfe6727c54929703156