StrictMode: batch drop box writes for system apps

Change-Id: Iab49c15ecccefea1d36d86271e1ceb37d79e9449
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 0fb2b49..c88e086 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -3102,7 +3102,9 @@
          * For system applications on userdebug/eng builds, log stack
          * traces of disk and network access to dropbox for analysis.
          */
-        if ((data.appInfo.flags&ApplicationInfo.FLAG_SYSTEM) != 0 &&
+        if ((data.appInfo.flags &
+             (ApplicationInfo.FLAG_SYSTEM |
+              ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) != 0 &&
             !"user".equals(Build.TYPE)) {
             StrictMode.setThreadBlockingPolicy(
                 StrictMode.DISALLOW_DISK_WRITE |