Merge "Do not dismiss priority children of a group being dismissed" into...

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

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



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