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

Change-Id: I52b2a4000c2042638e81eb7c4c6996d1a2859e6b