[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 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: I26ff5e720432db9f37e53c2341f7ef134b8faeb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>