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

Change-Id: I32eed4d290048de66a06e1fce790e6e113d68534