Merge "fs_mgr: Move fs_mgr_overlayfs_already_mounted higher in file." am: 09e7b12a7a
am: 74808cd5ed

Change-Id: Ib4ff993296bd792ab9fcf0d0a79906d1a356968f