DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: 32a0b7351e
am: 9d6bb6929a  -s ours

Change-Id: I396efa56e2d0b2c91d5dfa5cb3ece2ded0144c34