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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdbd216ae01326dbaf20e6db7e103351ada9427a