Merge "Bluetooth 5 AdvertisingSet implementation (4/4)"
am: 1317fe40e0

Change-Id: I6642bb6214f9d23e9a2a9b6c6bb3a690e9d69112