Merge "Canonicalize include stack::gatt::gatt_api" am: a6208471 am:...

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

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



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