Merge "UserDataPreparer: fix volume preparation order" into tm-dev am: 5815b8820e am: 2ac2a8a7a2

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

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