Merge "Updates noparent to only apply to the per-file files." am: ea8ca4b88a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I781f2762bbc45a0e9c71932bf79afbadda2e8878