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

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

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

Change-Id: I9d58a3b1e20c1dc721d925582532940379ad1c4d