Merge "Only register the primary KeyguardClockSwitchController w/ DumpManager" into main