Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d0853 am: c2ca1771" into nyc-mr2-dev-plus-aosp