Merge "Move sdk data to target volume when moving app data" am: 8bf940fea2 am: c8474c6880

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2031824

Change-Id: I4b10c3774ad1b4e88fc4f93f9246e0265572770e