Merge "Expose Bluetooth 5.0 properties to JNI" am: 39b4f8eeff
am: 7556b97c51

Change-Id: I74c8269721d2bc370d1a8edd8a3ca3eccd64f8df