Merge "fs_mgr: Refactor fs_mgr_overlayfs_already_mounted() to be more readable" into main am: 9603a82932 am: fd7424338a am: 0de639dc60 am: 309e38e652 am: 38c4e88e3c

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

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