[automerger skipped] Follow error prone recommendation am: 14a79049 -s ours...

[automerger skipped] Follow error prone recommendation am: 14a79049 -s ours am: bacda94e -s ours

am skip reason: Merged-In I6a49a8ef8c6b380547cbb817468fa33bf89347a3 with SHA-1 e5975fec is already in history

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



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