[automerger skipped] Merge changes from topic "uwb_api_change" am: 17cc39f7d8 am: 4f20a977b8 am: c284574ccd -s ours am: 1a462766dc -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: Ie5b0ad7561971b8f1ceb5c246d5b4eb3f4bd3b30
This commit is contained in: