Merge "Bluetooth 5 AdvertisingSet implementation (4/4)" am: 1317fe40e0 am: b2475c5afa
am: ff005ba330

Change-Id: I423311e19bead2f0fd8c9d54600be0917049f372