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

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

Change-Id: I2804db77757e5c85780838805ee23e3f571c3477