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

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

Change-Id: I80bb35f0b4a4da105900efcbac9e778c696596e6