[conflict] Merge changes I639960af,I7167f6fd am: 9e7b36cb am: b580c94f am:...

[conflict] Merge changes I639960af,I7167f6fd am: 9e7b36cb am: b580c94f am: e3432ffd am: e7ca99ca am: e32810ea

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



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