Merge "fs_mgr: remove atgc mount option for zoned device" am: 4ae0eb0f86 am: 978c70eccb am: 35dd0ef27a

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

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