Merge "Bluetooth 5 fix default AdvertisingSetParameters values"
am: 7bf58d5975

Change-Id: Idd2aad81fa1d6cc39d509c1556e8d1f7eb24a3b2