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

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

Change-Id: I5d6e49a7503db923603675fc7bfac1a74017793b