Merge "Support for reading NFC tag supporting multiple protocols" am: 1eeb56c31c am: cb6ac3d0ea

Change-Id: I10ef4273241b13b9ece70ddbffe36776defdf30e