[automerger skipped] [Pandora] - Enable AVDTP/SNK and add some A2DP/SNK am:...

[automerger skipped] [Pandora] - Enable AVDTP/SNK and add some A2DP/SNK am: 06436a43 am: 4f71a5d4 -s ours

am skip reason: Merged-In Ia2c95c37bfbb4ce03119042fbad8470daeefaea3 with SHA-1 06436a43 is already in history

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



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