Merge "Do not dismiss priority children of a group being dismissed" into udc-qpr-dev am: 5b343970

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



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