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

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

Change-Id: Iab51f9238ece0fc805ee50a9892d3c726c02fcab