Merge "Replace incomplete path-based check with statx" am: 0791285a am:...

Merge "Replace incomplete path-based check with statx" am: 0791285a am: 7d47c82b am: 0edf2cdb am: bfaca30a am: 47bbdaf2 am: 1e8d6da9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2559927



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