Merge "fs_mgr: overlayfs: fs_mgr_overlay_setup true if already mounted" am: c6a2d7d5cd
am: d191b29fb7

Change-Id: I977f83b0e135c11abce35ee6da51dbe215fa2d09