Merge "java_api_contribution module definitions for bluetooth" am: 8005b879...

Merge "java_api_contribution module definitions for bluetooth" am: 8005b879 am: 3be338d9 am: 52569ac5

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



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