Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: c2ca17711e" into nyc-mr2-dev-plus-aosp
am: 6abec50032  -s ours

Change-Id: I8684c26867a84287f5e8ccee51eb1e15278338f1