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

Merge "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" into rvc-qpr-dev-plus-aosp am: 9547b9a4

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

Change-Id: Ia33c77bda71b83c5166464176d68a0ec62997b26