Merge \"Merge \\\"Resume only activities in focused stack\\\" into nyc-dev am: 06b1d786e9 am: fee6e7f102\" into nyc-mr1-dev-plus-aosp
am: 42dcd5919d

Change-Id: Ibaa17b8d70336e5b3ef584ef7d05ffba72f94479