[automerger skipped] Merge "Move sdk data to target volume when moving app data" am: 8bf940fe am: c8474c68 am: 27b00fa9 -s ours am: 4cfcc51b -s ours

am skip reason: Merged-In I38c97e3d6b1bef18b50f161d5bd99b47c9c1923e with SHA-1 e7634ba3 is already in history

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

Change-Id: Iedd1cbadf9eb6ba2e3b9085a3644663e658a484b