[automerger skipped] Merge "Follow error prone recommendation" into...

[automerger skipped] Merge "Follow error prone recommendation" into stage-aosp-master am: ba608365 -s ours

am skip reason: Merged-In Ie3f35df29a81a5f55a28b63ce2c228eedd1f72f0 with SHA-1 7ffbcd2e is already in history

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



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