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 am: 11c728a1 am: a02b76bf

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



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