Merge "[automerger skipped] Merge "Minor change to prevent unnecessary error log." into tm-dev am: 7ed41b79 am: 28ac7859 -s ours" into tm-d1-dev-plus-aosp am: afffa240 -s ours am: ffb75fe1 -s ours

am skip reason: Merged-In I2b97db12a15f92cc4e0b909f9c3d8a515c27692a with SHA-1 65a89505 is already in history

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



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