Merge "Only register the primary KeyguardClockSwitchController w/ DumpManager" into udc-qpr-dev am: 839f081b9d

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

Change-Id: I69c032112962873486cb8144ac97f1404e1a4e18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>