Merge changes Ibe252136,I33838da7,I22550eca am: 80128e26 am: ed59b1a8 am:...

Merge changes Ibe252136,I33838da7,I22550eca am: 80128e26 am: ed59b1a8 am: bfacd49a am: 033201f7

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



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