[automerger skipped] Remerge TQ1A.230205.002 am: bd19f305 am: df950376 -s...

[automerger skipped] Remerge TQ1A.230205.002 am: bd19f305 am: df950376 -s ours am: 1e4d6cc5 -s ours am: 2146dd6e -s ours

am skip reason: Merged-In I4f57bb070053d27430e6ddb6a8266a5b587eda84 with SHA-1 2a329d8c is already in history

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



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