Merge "Merge \\"Don\\'t compare intent filters on singleTask adjacent launch\\" into nyc-dev am: 42147f0f am: 83972553" into nyc-mr1-dev-plus-aosp