Merge changes from topic "cherrypicking-party" into tm-qpr-dev

Created merge manually following playbook https://playbooks.corp.google.com/android-build-automerger-merge-worker/AutomergerWorkerCannotBatchDesiredCommitException.md?cl=head

Command

gob-curl -H "Content-Type: application/json" -d '{"project":"platform/packages/modules/Bluetooth","branch":"tm-mainline-prod","subject":"Merge changes from topic \"cherrypicking-party\" into tm-qpr-dev","is_private":false,"work_in_progress":false,"new_branch":false,"topic":"tmQPRDevTotmMainlineProdUnblock","validation_options":{"code-owners~skip-validation":"true"},"merge":{"allow_conflicts":true,"source":"e0be500c","strategy":"ours"},"notify":"NONE"}' https://googleplex-android-review.googlesource.com/a/changes/


Bug: b/257275245
Change-Id: I8f608f446344c2244971e3ff21fc3b18dd763a3c