Revert "Only add divider when it need to show"

This reverts commit a0ee06083c9e85f8fe931702f45f263f69a45f29.

Reason for revert: Cause cf devices cts tests failed

Bug: 158836294
Change-Id: I5b439cf1aaee51f0c6d2e7e7e8d73487ec851648
2 files changed