tree ea1c0cd50b14f14715a83dd26b5efaaf2ff35746
parent d80935ce6a450a821c5de5bf5e1a84c4f5cb2ee7
parent 3737b446dfdf8935010e9fb8503edb17969b4ed2
author John Lai <johnlai@google.com> 1709604736 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1709604736 +0000

Merge changes Ie4eb7633,I9fb7ac24 into main am: 3737b446df

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

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