Merge "Bluetooth: split setting params and enabling  advertising (2/3)" am: 9e1a02cc5e am: ba15066e9a
am: ed4ccc945b

Change-Id: Ic5375b71dee0acde6822294e6d9f90d12e5d809f