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

Merge "Revert "Skip F2FS formatting for dev option enabled devices"" into main am: 5e359c04 am: 6767e393

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



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