[automerger skipped] Merge changes from topic "uwb_api_change" am: 17cc39f7 am: 4f20a977 am: c284574c -s ours am: 1a462766 -s ours

am skip reason: Change-Id Ie08216638c8a5bf7260fff8752a46aad06f53fcb with SHA-1 16fddb44 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic31a42dd9b37d2c7258f9d890fca7b63c3a1c44a