Merge \"remove Intent.FLAG_ACTIVITY_NEW_TASK flag check\" into nyc-mr1-dev
am: 4828bb9330

Change-Id: I6d594545f43f5ca8e9a7b777a8f1b8b6b80e7fa6