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: 5b5dcbdc am: 92f81308 am: ed6e7fee

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

Change-Id: I39448a40ae992c1052c2f16ea63ba652786e026a