[automerger skipped] Merge "Add a UWB subsystem uid" into sc-dev am:...

[automerger skipped] Merge "Add a UWB subsystem uid" into sc-dev am: e7f4abd0 am: d4c5a9f5 -s ours

am skip reason: Merged-In I6b67c2f7243c50c83cb159c50519a318892f6941 with SHA-1 f4d57c09 is already in history

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

Change-Id: I658d12463534309c7bb8d96e9d4fec32e9248514