[automerger skipped] Merge "Log device bus for keyboard metrics" into main am: b3a18767e0 -s ours am: c833762ad8 -s ours

am skip reason: Merged-In Id96d86242ab239c7df0efe74bf13fb97eb97f482 with SHA-1 03a1658c6d is already in history

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

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