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 am: 72d245c5

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



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