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: I2b482b4354f9d532e0b4ab66d4965114b6725744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>