Merge "Merge "docs: Revised "activity launched with NFC intent" code sample to demonstrate using onNewIntent() in these situations" into nyc-dev am: 0f290c96 am: e2f1d3f3" into nyc-mr1-dev-plus-aosp
am: 39f02cf0
Change-Id: I4cd45334b493a7a71b0563be8017f13e6c6f952f