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-dev am: f0d08645 am: 3824f769

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



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