Merge "Revert "Use apex_available for PermissionController.""
diff --git a/apex/apex.go b/apex/apex.go
index c50dd1d..4f5f247 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -747,6 +747,10 @@
 	//
 	// Module separator
 	//
+	m["com.android.permission"] = []string{"GooglePermissionController", "PermissionController"}
+	//
+	// Module separator
+	//
 	m["com.android.runtime"] = []string{
 		"bionic_libc_platform_headers",
 		"fmtlib",