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

Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e9 am: 6f66eb57 am: 81ac9d03 am: 2f91a14c

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

Change-Id: Ia0a4e445baf99cf927764eff904495f4559207b5