Merge "fs_mgr: Don't run clean_scratch_files on non-dynamic devices" into main...

Merge "fs_mgr: Don't run clean_scratch_files on non-dynamic devices" into main am: c0281978 am: 76020e22

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



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