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

Change-Id: Idb05a64891031ee5b2afa1e94c611e02ba3cb5fd