Merge "docs: Revised "activity launched with NFC intent" code sample to demonstrate using onNewIntent() in these situations" into nyc-dev
am: 0f290c9683

Change-Id: I3388ff611a3e1bd7cc5242c1a446c552a444f01d