[automerger skipped] Merge "Shell: Allow usage of UwbManager APIs" am:...

[automerger skipped] Merge "Shell: Allow usage of UwbManager APIs" am: 762a92d7 am: b6dd2849 am: 290be221 -s ours am: 4e96d2af -s ours

am skip reason: skip tag Change-Id Ie4264cdcd3f84c965da70f8f8fefe538378c47f6 with SHA-1 8cf4edc1 is already in history

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

Change-Id: I1496151e1e93ce8647b7bb7e53eecc242a71b341