[automerger skipped] Follow error prone recommendation am: f7b9835e -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: I5a9412661c960a60f870f210e668c278bc656c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>