Merge SP1A.210510.001

Change-Id: Ie3532d68a6c5d1b673f44bd8505268426df1cf54

1.2/Android.bp

@@ -12,6 +12,7 @@ cc_binary {
     defaults: ["hidl_defaults"],
     proprietary: true,
     init_rc: ["android.hardware.nfc@1.2-service.samsung.rc"],
+    vintf_fragments: ["android.hardware.nfc@1.2-service.samsung.xml"],
     relative_install_path: "hw",
     srcs: [
         "SecNfcService.cpp",

1.2/android.hardware.nfc@1.2-service.samsung.xml

+<manifest version="1.0" type="device">
+    <hal format="hidl" override="true">
+        <name>android.hardware.nfc</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>INfc</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@1.2::INfc/default</fqname>
+    </hal>
+</manifest>