Merge changes from topic "avrcp_settings_pts_tests" am: c128d7f7

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



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