Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: f3eef9a286" into nyc-mr2-dev-plus-aosp
am: a351145b9b  -s ours

Change-Id: I8ef5b99d3dcefe4f08e73390cab2e53de62ffb26