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

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

Change-Id: I8eab5149728860af583d5aabb0027fbdfc7f0beb