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

Change-Id: Ib9d550db454a6a243845a70651127282b723b2d7