Merge "[Dagger] Move BatteryStateChangeCallback out of KeyguardStatusBarView and into its controller." into sc-v2-dev