Merge "Bluetooth 5 AdvertisingSet implementation (3/4)" am: ecb7fc5332
am: 00a91f290b

Change-Id: I1db5837866531e13cfbaca4b8660f24c5bd09136