Merge "Merge "Prepare user storage when a private volume has been mounted."...
Merge "Merge "Prepare user storage when a private volume has been mounted." into rvc-dev am: 9df5ebf7 am: a96c6bcc am: 3d6c65c3" into rvc-qpr-dev-plus-aosp am: 463e0d57
Change-Id: I7dcf23f986377dff751f8c116835cd895a8764d7