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

Change-Id: I652b94f07bccf536df1b8d30e956935202045e6a