Merge "Adopted Storage: Prepare user storage before move" into main am: 798b1fe4e8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2694909

Change-Id: I3a804daf83db76544f9ee7e9cabaeadf44427170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>