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