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