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

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

Change-Id: Ia7f72b55c379b2a15f3b3247e361e423e78ab4ce