Merge "Add UWB AIDL" am: 6bf6e05d47 am: d6362ce402

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

Change-Id: I4a4093562f5c1188893af58176246e36ebf04343