Merge "fs_mgr: remove atgc mount option for zoned device" am: 4ae0eb0f am:...

Merge "fs_mgr: remove atgc mount option for zoned device" am: 4ae0eb0f am: 978c70ec am: 35dd0ef2 am: 24b771eb

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



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