Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am: f0c963a5b6 am: 375741e99a
am: d7714c45e0

Change-Id: I71d5455248a9840aadf02859ba8652bd80eca559