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

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

Change-Id: I42a82bedde9eedbfd160892a042bc49f98d3de2b