Merge "AdapterService: Fix NPE in JNI and correct type for casting and reference correct method name." am: d9d42516bc am: f81613e4b6

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

Change-Id: I30eaa56480ccbd9448be75e78e5a04c4020bae03