Merge "build framework: remove app-compat-annotations from test" into main am:...

Merge "build framework: remove app-compat-annotations from test" into main am: 0c0b8a18 am: 955f4004 am: 17eb060f

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



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