Merge "Gd: Fix readability-braces-around-statements warnings" am: 139dd127

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



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