[automerger skipped] UserDataPreparer: fix volume preparation order am:...

[automerger skipped] UserDataPreparer: fix volume preparation order am: a1c15b70 -s ours am: a9198b98 -s ours

am skip reason: Merged-In I146d8c786c6b923aed7f8c748db8a7e90c96687f with SHA-1 a8a53c26 is already in history

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



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