Merge "Merge "Only add divider when it need to show" into rvc-dev am:...

Merge "Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb am: 82a8ca18" into rvc-d1-dev-plus-aosp am: 7d44d5a2

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

Change-Id: I29c1930244a104f7a90c67e107160d1c4b329c04