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 am: 65e38b7e

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

Change-Id: Ia01fc23f0da0f5374a1670abe3c1ab60e7e1c6e9