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

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

Change-Id: I2274b246c949846a48d622090c17be3d0baed4b3