[automerger skipped] Merge "[DO NOT MERGE] Add animation for Dnd dialog" into...

[automerger skipped] Merge "[DO NOT MERGE] Add animation for Dnd dialog" into sc-v2-dev am: 8a05667f am: 87854d4d -s ours

am skip reason: subject contains skip directive

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

Change-Id: If730383d24dad6dd6d94a22aae5d1d3ffe3673be