Merge "Revert "Sort canned fs_config lines to facilitate comparison with...

Merge "Revert "Sort canned fs_config lines to facilitate comparison with Bazel-built APEXes"" am: 480a5626

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2507150



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