Merge "Fix divider display issue" into sc-v2-dev am: bd64fd9f66 am: 2e4147003c

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

Change-Id: I4dac89dc333509122e684773bf99fad67f31c267