Merge changes I65e98ce8,Id54106d9 am: d6707153 am: 1b27a1d9 am: ca1ea56c...

Merge changes I65e98ce8,Id54106d9 am: d6707153 am: 1b27a1d9 am: ca1ea56c am: 234bb5a4 am: 7cbde6f7

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



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