Merge "Merge \\"Compare intent filter when launching adjacent\\" into nyc-dev am: 9980514ee0 am: b809d1cb79" into nyc-mr1-dev-plus-aosp