[automerger skipped] Enable styling of dividers for linear and grid view separately. am: b66a3699c7 -s ours

am skip reason: Change-Id I6c4b70f5bf70d370e0dd4455b9eda4b5c7af181a with SHA-1 5ef7ae3bd2 is in history

Change-Id: I924bc52253213cfc012370bce64f7c53e5a9891d