DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent()...
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d0853 am: 32a0b735
am: 9d6bb692 -s ours
Change-Id: I396efa56e2d0b2c91d5dfa5cb3ece2ded0144c34