Merge "Reland Skip F2FS formatting for dev option enabled devices" into main...

Merge "Reland Skip F2FS formatting for dev option enabled devices" into main am: 06e83237 am: bacf172f

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



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