Merge "Migrate KeyguardClockSwitch to new shared Clock library" into tm-qpr-dev