[automerger skipped] Merge changes from topic "uwb_api_change" am: 17cc39f7d8 am: 4f20a977b8 am: c284574ccd -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ff125e039e18e0f99d118161db7fc4b93ce4aaf