[automerger skipped] Merge "Merge TP1A.221005.003" am: 30e176d5 am:...

[automerger skipped] Merge "Merge TP1A.221005.003" am: 30e176d5 am: 9b51e956 -s ours am: fa9f7531 -s ours

am skip reason: Merged-In I68dd78c747eeafee5190dc56d7c71e9eeed08a5b with SHA-1 ed9a843c is already in history

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



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