Merge changes I00673f01,Iab535d7c,Iaee68ebe am: 84f442b7 am: 97e63ca1 am:...

Merge changes I00673f01,Iab535d7c,Iaee68ebe am: 84f442b7 am: 97e63ca1 am: f77b34ae am: 320d47f4 am: 68d0cb77

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



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