[automerger skipped] Merge "Fix floss build by providing a compatibility shim...

[automerger skipped] Merge "Fix floss build by providing a compatibility shim for BoringSSL." into udc-dev-plus-aosp am: d57d10a6 -s ours am: fa7bf694 -s ours

am skip reason: Merged-In I01a00e2be317e1feffd0a6f67fd2cf9b67e09d13 with SHA-1 d3a08866 is already in history

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



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