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

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



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