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

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



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