[automerger skipped] Merge "Follow error prone recommendation" am: 2adb8b89 -s ours am: 82b0e1ad -s ours am: 0058ca8d -s ours

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

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



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