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

Change-Id: Iea394761590c392c4401e80ef67bbeecd6b3921a