[automerger skipped] Merge "Metrics collector: Log a separate bus for USI styluses" into udc-qpr-dev am: 92fc9071be am: 130c82355e -s ours

am skip reason: Merged-In I954e5a7c3db7d1ae3d0c6906923848fe5ced84f1 with SHA-1 67d09ca888 is already in history

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

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