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

Change-Id: Ic4f774a802972523f3295eda0463bd77e5ff7688