tree c2c8d3e52f453cfd79776457c35d2935a698b93c
parent 89b965d721c1b41755dc4935e576158d554714e5
parent 2e6d4b42917664491cd42bc0e13a2961ef058db4
author Jack He <siyuanh@google.com> 1645635483 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645635483 +0000

Merge changes I343ff48c,I4b1ecf81 am: 2e6d4b4291

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

Change-Id: Id92c7e06e2d4a4ecbbf63942a922613ce6484020