Merge "Add scan filter for Transport Discovery data" into q-keystone-qcom-dev