tree ba478095939a0624f8326df95288002cb357281a
parent 133e6cfef0b4ce2c0bf0c2e0f7eda6662f585938
parent 23e9e5373c09f6c313400f32d92ca47fd4f1225f
author Dave Mankoff <mankoff@google.com> 1616529673 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1616529673 +0000

Merge changes from topic "change-13630081" into sc-dev

* changes:
  Revert^2 "Remove final calls to Dependency.get from keyguard."
  Revert^2 "Remove Dependency.get from KeyguardStatusView."
  Revert^2 "Add injection to ClockProvider."
  Revert^2 "Remove Dependency.get from KeyguardSliceTextView."
  Revert^2 "Add Controller for Emergency Button."
  Revert^2 "Add ViewController to CarrierText."
  Create central TelephonyListenerManager.