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