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

Change-Id: I501192a2c343ef3f4dd661ad34b76d8ad04bbf9a