Merge changes from topic "uwb_api_change" am: 17cc39f7d8 am: 4f20a977b8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2647753ae38340370ccc9ed560d6f4b39a58ffd