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

Change-Id: I13dfd19877828eac02532a44fe8f6ba35418929b