framework-nfc: Switch to "framework-module-defaults"

Now that all the @hide usage of NFC API's from rest of platform is
cleaned out, we can now switch to the module defaults and continue the
separation of NFC API classes.

Bug: 303286040
Test: Compiles
Merged-In: I8bd5e38b1482600594c41660d14537cf15b48318

Change-Id: I8bd5e38b1482600594c41660d14537cf15b48318
diff --git a/api/ApiDocs.bp b/api/ApiDocs.bp
index d7e2583..62f0b6e 100644
--- a/api/ApiDocs.bp
+++ b/api/ApiDocs.bp
@@ -51,6 +51,7 @@
         ":framework-graphics-srcs",
         ":framework-mediaprovider-sources",
         ":framework-nearby-sources",
+        ":framework-nfc-updatable-sources",
         ":framework-ondevicepersonalization-sources",
         ":framework-permission-sources",
         ":framework-permission-s-sources",
diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp
index ef1fa60..74344cd 100644
--- a/api/StubLibraries.bp
+++ b/api/StubLibraries.bp
@@ -635,7 +635,6 @@
     api_contributions: [
         "framework-virtualization.stubs.source.test.api.contribution",
         "framework-location.stubs.source.test.api.contribution",
-        "framework-nfc.stubs.source.test.api.contribution",
     ],
 }
 
diff --git a/api/api.go b/api/api.go
index 43713aa..b975c55 100644
--- a/api/api.go
+++ b/api/api.go
@@ -31,7 +31,6 @@
 const i18n = "i18n.module.public.api"
 const virtualization = "framework-virtualization"
 const location = "framework-location"
-const nfc = "framework-nfc"
 
 var core_libraries_modules = []string{art, conscrypt, i18n}
 
@@ -43,7 +42,7 @@
 // APIs.
 // In addition, the modules in this list are allowed to contribute to test APIs
 // stubs.
-var non_updatable_modules = []string{virtualization, location, nfc}
+var non_updatable_modules = []string{virtualization, location}
 
 // The intention behind this soong plugin is to generate a number of "merged"
 // API-related modules that would otherwise require a large amount of very