Merge "Move KeyguardStateController.Callback to field of StatusBar." into sc-v2-dev