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

Change-Id: Ieb03aed00cee20c367f52aa8ea1b1fd02a6fbbac