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: ad6295b4 am: 8f04055c

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



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