Merge "docs: Revised "activity launched with NFC intent" code sample to demonstrate using onNewIntent() in these situations am: bd66ef7f2f am: 69e4872401" into nyc-mr1-dev-plus-aosp
am: 04bbcd828f

Change-Id: Iaf5bb44acd201639534a0d278071fc9cd8cb843f