Remove unnecessary dependencies

This wasn't previously possible due to ties to StatusBar.java - however
since we've restructured it in a different way, we can pull out these
dependencies

Bug: 147455109
Test: manual
Change-Id: Ica8f288cd9b54742383a1c4e02b53f08f0da3e1b