Merge "Only manually show non-reported parents which is also non-organized"...

Merge "Only manually show non-reported parents which is also non-organized" into main am: d62fa446

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



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