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

Change-Id: If22fbe10f010225ed0843adabfe25917205a8b47