Merge "fs_mgr_overlayfs: Remove backing image if failed to allocate scratch"...

Merge "fs_mgr_overlayfs: Remove backing image if failed to allocate scratch" am: 25eb51a9 am: ad7b2aa2

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



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