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

Change-Id: I303fbf653865158f31de98b7b0d640c92ba896f6