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

Change-Id: Ie0d893078b1f6179f39b7445a1712eca7a4ba748