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

Change-Id: Id711563a93995c1c58bcf299d3cca3c3624557fc