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

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

Change-Id: I90ccc834dabbad3ecc203a5f36e0e937878513bb