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

Merge "Don't depend on private/android_filesystem_config.h" into main am: 09899bc0 am: 33fb10a5 am: 5a9b7bbc am: 15c071f6

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



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