Merge "BLE: Add service solicitation uuid feature in scan filter"
am: e226488c8c

Change-Id: I7894fb1ea38c29c860cb6d3986eed0c85f07907d