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

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

Change-Id: I4b3139481fa8741602d5416e11d77ca676ba8c14