Merge "Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev am: 10bafbd9f9 am: c2226d8db6" into nyc-mr1-dev-plus-aosp
am: d92381cc1e

Change-Id: Id83aad06b09017b0faa63249751e69198be79cdb