Merge "Only add divider when it need to show" into rvc-dev am: c27a155d am: e60b3fc4 am: 0a096785

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

Change-Id: Ib02e9e8149a2bf5453a6372b50fec90d88dedfca