Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf8145 am: c27f8b02" into nyc-mr2-dev-plus-aosp