[automerger skipped] Merge "umount /data/user/0 before umount /data" into rvc-dev am: 16df3dc2b5 -s ours
am skip reason: Change-Id I919f9e31a9d2d745b297a7ab99b399aa9b293b39 with SHA-1 3cf3233bac is in history

Change-Id: I22164c5f84bf5ab19a8586d2000cbb98a28e33c0