[automerger skipped] Merge "Only register the primary KeyguardClockSwitchController w/ DumpManager" into udc-qpr-dev am: 839f081b am: 65e89f56 -s ours

am skip reason: Merged-In Iebe14fad8e0a883c5f4fec7fb50bb6ce0107f8fc with SHA-1 de52ef1f is already in history

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



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