Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c

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

Change-Id: Ic6a169058797e4e52349a4ad51919955fb1d521b