Merge changes from topics "btaa-jni-1", "btaa-jni-2" am: b9ba96fa am:...

Merge changes from topics "btaa-jni-1", "btaa-jni-2" am: b9ba96fa am: af4a3c03 am: 91bda67c am: e59a1686

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1488139

Change-Id: Idc23698ba387744b1b03d9207c9ecee40cb0d33b