Merge "Removed SDK comparison to fix errorprone target" am: b8d40257 am:...

Merge "Removed SDK comparison to fix errorprone target" am: b8d40257 am: 1887d984 am: f99a1410 am: fdb18c88 am: 7292d0ca

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



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