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

Change-Id: If20a7c200e7bba6a70a507b120675fba8e33ca5c