Merge changes from topic "bt_dynamic_avrcp" into tm-d1-dev am: e957c087 am: 4070105f

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



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