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

Change-Id: I1a708d573b412bd556912b163d99f774bbef05b4