[automerger skipped] Merge "Update to use nativehelper/JNIPlatformHelp.h" am:...

[automerger skipped] Merge "Update to use nativehelper/JNIPlatformHelp.h" am: afd5261e am: 43877927 -s ours am: 3e4cee10 -s ours am: 6d800dd6 -s ours

am skip reason: Change-Id I7696163cb0e87fd9419ec384553969e71c68f1f3 with SHA-1 e79db00d is in history

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

Change-Id: I23fb8055e99c87d59d8de44d80bf3d37e1050c37