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

Change-Id: I5a6132fd684caa452b768223b8d011c1dcb270ad