Merge 25Q1 (ab/BP1A.250305.020) to AOSP main

Bug: 385190204
Merged-In: Ib29382d17cc4fd6b479c68674f2efaa1ac626f19
Change-Id: I3f708d122f3f899af5828e67a0287fe8a28bef33
diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
index 48fa6a3..6444178 100644
--- a/fs/Exfat.cpp
+++ b/fs/Exfat.cpp
@@ -102,7 +102,7 @@
     std::vector<std::string> cmd;
     cmd.push_back(kMkfsPath);
     cmd.push_back("-n");
-    cmd.push_back("android");
+    cmd.push_back("External");
     cmd.push_back(source);
 
     int rc = ForkExecvp(cmd);