Merge "Don't depend on private/android_filesystem_config.h" into main am: 09899bc0a8

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

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