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

Change-Id: I381c457d3de402ba7cae896517aac78fb6d272d6