Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb am: 82a8ca18 am: 06e6adda

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

Change-Id: I290dda1cb66b0a82821a11ff51eb5b0d08ed1db4