[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 am: 35daaa03 -s ours

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

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

Change-Id: I393a7b375877438c83699a7b13ffc880bf0872dd