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

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



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