Consolidate Divider Provider

Bug: 146670576
Test: builds/runs
Change-Id: Ib5ca2cb73d7e453940fb2e07dd7a6dcfa12c00ce
3 files changed