Merge "Merge "UserDataPreparer: fix volume preparation order" am: 0c0888da...

Merge "Merge "UserDataPreparer: fix volume preparation order" am: 0c0888da am: 5e3ed272" into tm-dev-plus-aosp am: 9514f87b

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



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