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

Change-Id: I64111793f7cb350f7f155727934cabc5fbd2480f