[automerger skipped] Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into...

[automerger skipped] Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd73 am: 1d35b1cd -s ours

am skip reason: Merged-In Ib0fee46471c7f110b265faedc62a3f66610bf7c2 with SHA-1 63976c20 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887

Change-Id: Iab4eb00b849316422f1fe0a6d72f9acdde62d1c9