Merge "Moves dump one level up for ClockEventController." into tm-qpr-dev am: ad84af50f6 am: df0c4121a5

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

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