DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
am: f73d085395

Change-Id: I9cee73a7146ff97dcc7f82447f06281f71bc2466