[automerger skipped] Merge "Update AVRCP default version to 1.5" into...

[automerger skipped] Merge "Update AVRCP default version to 1.5" into sc-qpr1-dev am: 1892a884 -s ours am: c8b416cc -s ours am: 11e4592f -s ours

am skip reason: Merged-In I079edc35f7733f8dd63c4577b72be1320a3de499 with SHA-1 a0584314 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15853797

Change-Id: I31c1411beef28a2e7ad8d75928e1f634d87f1b1a