[automerger skipped] Merge "Do not dismiss priority children of a group being...

[automerger skipped] Merge "Do not dismiss priority children of a group being dismissed" into udc-dev am: f0d08645 am: 3824f769 -s ours

am skip reason: Merged-In I6ee36618889b4fe1c8999ff149034a7db63fcbb7 with SHA-1 58051910 is already in history

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



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