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

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

Change-Id: I47863018b82969ed356aea667469adfc2e3ada41