Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()" am: 6c5c085e41
am: bd15393281

Change-Id: Iebd9611b2fc18a6fa9f538a0d0be1d596ace0295