Merge changes I991994e9,I46512626,Ib23570d8 am: 1bb3c35f am: 2dd0d59b am:...

Merge changes I991994e9,I46512626,Ib23570d8 am: 1bb3c35f am: 2dd0d59b am: 5b242b54 am: 1431badb

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



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