DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: c2ca17711e
am: 1b9cec4860  -s ours

Change-Id: Ib57510dd24676e8b47789b5a5bd9cddabf2995df