Merge \"Don\'t compare intent filters on singleTask adjacent launch\" into nyc-dev
am: 42147f0ff3

Change-Id: I6e0cc9c5a1b6245735ac9ba2a645231619c38eec