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 am: 05adabf9

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



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