Merge "Immediately deliver new intent to paused activities. am: 03f7e9e944 am: 08d6689303" into nyc-mr1-dev-plus-aosp
am: c8ceb557fd

Change-Id: I5fb78a433c2d5279a08b05d3f649e6937613aab7