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: 8acb04e2 am: 5394166f am: a2b8f333" into rvc-qpr-dev-plus-aosp am: 87cdd208
Change-Id: Ib6b7763fdd400ec47f788fd96088e30463103026