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

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



Change-Id: I0df9bc8e0ed2a9b1acaec7dbe8df0e6317ee3aa9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>