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

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

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