Merge "Add android.hardware.nfc@1.2" am: 2664a4a8c5
am: 07b4b1d20c

Change-Id: I93f9d9d903501f6f083b3de526df68fb732ccba4