[automerger skipped] Merge "AudioService: refactor BT profile management" into...

[automerger skipped] Merge "AudioService: refactor BT profile management" into udc-qpr-dev am: 84efe977 am: 6c606364 -s ours

am skip reason: Merged-In I7106b7516706c542be1fbdad65067b3b09de6a61 with SHA-1 4276c09b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24523470



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