Log device bus for keyboard metrics

Since the same vendor ID could mean different vendors depending on
whether the device is connected over bluetooth or USB, we require to know
the device bus to disambiguate the vendor IDs.
Also fixed some formatting issues.

Bug: 308918242
Test: atest InputTests:KeyboardMetricsCollectorTests
Test: atest ShortcutLoggingTests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:03a1658c6dbfadfeb57a408aa9fcfbdc5213a740)
Merged-In: Id96d86242ab239c7df0efe74bf13fb97eb97f482
Change-Id: Id96d86242ab239c7df0efe74bf13fb97eb97f482

NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java, hunk HunkHeader[30,13->30,13]: Hunk cannot be applied
Error applying patch in services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java, hunk HunkHeader[483,10->483,15]: Hunk cannot be applied
Error applying patch in tests/Input/src/com/android/server/input/KeyboardLayoutManagerTests.kt: Cannot perform UNIFIED action on a non-existent file
Error applying patch in tests/Input/src/com/android/server/input/KeyboardMetricsCollectorTests.kt: Cannot perform UNIFIED action on a non-existent file

Original patch:
 From 03a1658c Mon Sep 17 00:00:00 2001
From: Asmita Poddar <asmitapoddar@google.com>
Date: Mon, 27 Nov 2023 17:03:03 +0000
Subject: [PATCH] Log device bus for keyboard metrics

Since the same vendor ID could mean different vendors depending on
whether the device is connected over bluetooth or USB, we require to know
the device bus to disambiguate the vendor IDs.
Also fixed some formatting issues.

Bug: 308918242
Test: atest InputTests:KeyboardMetricsCollectorTests
Test: atest ShortcutLoggingTests

Change-Id: Id96d86242ab239c7df0efe74bf13fb97eb97f482
---