Merge "Metrics collector: Log a separate bus for USI styluses" into udc-qpr-dev am: 92fc9071be

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

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