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

Merge "Merge "Only add divider when it need to show" into rvc-dev am: c27a155d am: e03fc61c" into rvc-d1-dev-plus-aosp am: efd5f501

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

Change-Id: I6ddf5d5727849845d8e6c00972ed9451009d4af3