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

Change-Id: Ie767b54e2622a823d8e2fe2a864d788c3a81df74