Merge "Add header to DropBox crash reports to indicate instant app crash" into oc-mr1-dev

services/core/java/com/android/server/am/ActivityManagerService.java

@@ -14706,6 +14706,9 @@ public class ActivityManagerService extends IActivityManager.Stub
                 }
                 sb.append("\n");
             }
+            if (process.info.isInstantApp()) {
+                sb.append("Instant-App: true\n");
+            }
         }
     }