[conflict] Merge "Revert^2 "Run unit test with sources"" into main am: e130ea72 am: 4b035fce

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



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