Merge \"Merge \\\"Unblock \\\'am start -W\\\' if activity is brought to front...

Merge \"Merge \\\"Unblock \\\'am start -W\\\' if activity is brought to front without launching\\\" into nyc-dev am: 75c7cc6c am: 9800ee6f\" into nyc-mr1-dev-plus-aosp
am: 65d0ce94

Change-Id: I258c9e325808d1829435a0791fdfdbae24c50ca7