Merge "Don't depend on private/android_filesystem_config.h" into main am: 09899bc0a8 am: 33fb10a5ea am: 5a9b7bbc0e am: 15c071f690 am: 06b540857d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2779434

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