Merge changes from topic "avrcp_settings_pts_tests" am: c128d7f7 am:...

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

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



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