From: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Date: Tue, 15 Mar 2022 18:17:52 +0000 (+0000)
Subject: Merge cherrypicks of [16816453] into sc-v2-release.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e140c133342a5dd2cf201c01ef39c3baab86c386;p=android-x86%2Fsystem-bt.git

Merge cherrypicks of [16816453] into sc-v2-release.

Change-Id: I9a0ba25922932a9b49cf4b8d30b930bb9a122f19
---

e140c133342a5dd2cf201c01ef39c3baab86c386