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

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

Change-Id: I4a8cc7d19c1d613c706f6f5588bec1ebed10c9ea