Merge changes from topic "ble_ley_reorg" into main am: 6caaf790 am: cffe007b am: 654fda28

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



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