Merge \"Merge \\"remove Intent.FLAG_ACTIVITY_NEW_TASK flag check\\" into nyc-mr1-dev am: 92bc5edfa2\" into nyc-mr1-dev-plus-aosp
am: 941cc66b14

Change-Id: Icaf586d5a61be09463227a2e9c820a21d0652687