Merge changes from topic "avrcp_settings_pts_tests" am: c128d7f7 am: 4e92a308 am: c5834a3a

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



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