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

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

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

Change-Id: Ieec6d5e57a2e094d6cdc9909e444ce8a36b24e98