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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d16d3b3d878c698bd0fc650bc25dc50c41e5bbc