[automerger skipped] Merge "RESTRICT AUTOMERGE Cleanup non-security based...

[automerger skipped] Merge "RESTRICT AUTOMERGE Cleanup non-security based diffs between udc-qpr-dev-plus-aosp and main" into aosp-main-future am: fe80af77 -s ours

am skip reason: Merged-In Ie2e645e70fd2de5a24808e3951c5b4921b72d526 with SHA-1 91095362 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/25132887



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