Merge "Ensure UWB conforms to API guidelines" am: 0070e26a5e am: a0e1666a74

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I561ea72833cbadcae45cff01edf310fee80c6532