Fix the incorrect merge conflict resolution

This change fixes the incorrect merge conflict resolution of
3b17896950

Bug: N/A
Test: m
Change-Id: If00db9ab9758384a2def5442fbeecb36615d2ec1

apex/apex.go

@@ -743,14 +743,12 @@ func makeApexAvailableWhitelist() map[string][]string {
 		"kotlinx-coroutines-core-nodeps",
 		"libprotobuf-java-lite",
 		"permissioncontroller-statsd",
+		"GooglePermissionController",
+		"PermissionController",
 	}
 	//
 	// Module separator
 	//
-	m["com.android.permission"] = []string{"GooglePermissionController", "PermissionController"}
-	//
-	// Module separator
-	//
 	m["com.android.runtime"] = []string{
 		"bionic_libc_platform_headers",
 		"fmtlib",