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 am: 8aa35aff am: dba72631 am: 45422484

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



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