Migrate default app data on non-FBE devices.

When a system app requests "forceDeviceEncrypted" they expect their
default app storage to point at a consistent location regardless of
device FBE support.  So when booting upgraded non-FBE devices, we
may need to migrate any data from CE to DE.  Note that on non-FBE
devices these are just semantic locations with identical protection.

This migration *only* works for non-FBE devices; changing
forceDeviceEncrypted flags on an FBE device always requires a full
data wipe.

Bug: 26668510
Change-Id: I8bd5b8ba882e6bd067c0381041b27c35d6e47788
diff --git a/cmds/dumpstate/dumpstate.rc b/cmds/dumpstate/dumpstate.rc
index d1b7f8c..96232c4 100644
--- a/cmds/dumpstate/dumpstate.rc
+++ b/cmds/dumpstate/dumpstate.rc
@@ -13,7 +13,7 @@
 # user interface (like displaying progress and allowing user to enter details).
 # It's typically triggered by the power button or developer settings.
 service bugreportplus /system/bin/dumpstate -d -B -P -z \
-        -o /data/data/com.android.shell/files/bugreports/bugreport
+        -o /data/user_de/0/com.android.shell/files/bugreports/bugreport
     class main
     disabled
     oneshot
@@ -25,7 +25,7 @@
 # it will disable vibrations, screenshot taking and will not track progress or
 # allow user to enter any details
 service bugreportremote /system/bin/dumpstate -d -q -B -R -z \
-        -o /data/data/com.android.shell/files/bugreports/remote/bugreport
+        -o /data/user_de/0/com.android.shell/files/bugreports/remote/bugreport
     class main
     disabled
     oneshot