Merge "remount: Simplify fs_mgr_overlayfs_setup." am: 82e1fc07 am:...

Merge "remount: Simplify fs_mgr_overlayfs_setup." am: 82e1fc07 am: 70266efc am: 79ab6bbf am: c7a2022d

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



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