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: c2ca1771
am: 1b9cec48 -s ours
Change-Id: Ib57510dd24676e8b47789b5a5bd9cddabf2995df