[automerger skipped] Merge "Do not dismiss priority children of a group being dismissed" into udc-dev am: f0d0864579 am: 0c9d0a79eb -s ours am: 62fa3b28bd -s ours am: 1bae83e31c -s ours
am skip reason: Merged-In I6ee36618889b4fe1c8999ff149034a7db63fcbb7 with SHA-1 e6efbb4127 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23785932
Change-Id: I0078419cb28ed009dc49b9fa629790b9435eef57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: