Merge "Revert^2 "Use a partition packaging spec filter for android_filesystem"" into main am: 74c7c8ecb0

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

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