[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: 5807121e -s ours

am skip reason: subject contains skip directive

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



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