Merge "Refactor advertising callback mechanism in JNI layer for GD" am: 4710db7d2a

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

Change-Id: Ifcbe7def4761bf8f81fea87b165ac64af18b1779