Merge "Add support for Transport discovery AD type (2/2)" into p-keystone-qcom