Merge "Canonicalize include stack::gatt::gatt_api" am: a6208471 am: 9fdcd02b

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



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