Merge "fs_mgr_overlayfs: Don't try to mount scratch if already mounted" into...

Merge "fs_mgr_overlayfs: Don't try to mount scratch if already mounted" into main am: 7bcd7715 am: 054526a6 am: f0d4b582

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



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