Merge "Merge "Revert intent filter matching enforcement." into android13-tests-dev am: c25ce06fb0"