Merge changes from topics "apk_in_apex-burndown",...

Merge changes from topics "apk_in_apex-burndown", "apk_in_apex-burndown-fwk-bluetooth" into main am: e88e2384 am: cb1845e4

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



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