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

Change-Id: I89b90208e2df3ab971e02736b43a63f8c34e9943