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

[automerger skipped] RESTRICT AUTOMERGE Cleanup non-security based diffs between udc-qpr-dev-plus-aosp and main am: 63a63efc -s ours am: cf540547 -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: Ie6acc5d00ef05e6cd72dce6ba9fd4b7fad6b7d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>