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

Change-Id: I0186967662e9f68da05d506cc928f1c08fff9e56