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

Change-Id: Ia1535d006eb369e4b79c7aa073d0319f1cf8a88f