Merge changes from topics "btaa-jni-1", "btaa-jni-2" am: 531982f9f5

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

Change-Id: Ib469b3c47561e05d15e3327d3e817358ee309802