Merge "fs_mgr_overlayfs: Fallback to allocate scratch on super if /data failed" am: c0524606

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



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