Merge "Exempt connected apps from intent filter enforcement to itself" into tm-dev