[automerger skipped] Merge 10952656 am: 0641c69e97 -s ours am: fda41e6ef8 -s ours

am skip reason: Merged-In I0502add0f3453f32d504112fb23c60febbebf841 with SHA-1 8df4827c99 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Uwb/+/25093246

Change-Id: I93b57ac317b582959d2c72ff8dd516f760904310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>