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 am: d7f28f50

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



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