Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden"
am: bde9fc1787

Change-Id: I115026d227ceb9950020ebc97694d72c1fc04329