Merge "Move KeyguardStateController.Callback to field of StatusBar." into sc-v2-dev am: 4f82ace23f am: e05d3a9877

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312955

Change-Id: I415267efaf5d0b315934b71b360aa88bddf1922e