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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3512e1e3941d80d9fd5d574f5feb30d7bd89ac0c