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

Change-Id: Ia421c1f86708f3e726df0cd0b1e8bb1a1e9ea893