Merge "BLE: Add service solicitation uuid feature in scan filter" am: 13d6540956
am: 253403081a

Change-Id: Id401c429b4a95a92cf25dd3eec073b3b3fbf84a9