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
am: 98caeaa495

Change-Id: If9e81952a9807402d3a32951d1c8c8e1e836edff