Merge changes Ie8c7b6e3,I16e1c17d am: fc801fe9 am: 7c552d43 am: 7d5b999f...

Merge changes Ie8c7b6e3,I16e1c17d am: fc801fe9 am: 7c552d43 am: 7d5b999f am: 69766e02 am: 77045abb

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



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