Merge "Reboot sequence: Unmount active apexes before unmounting /data" am: b255195375 am: d60f0708c9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1327913

Change-Id: Ie64a60f5a104ad22326e2d632b5cf30b2f489f42