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 am: 247f0878

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



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