Merge "Merge "Wait for all of associated activities done animating" into...

Merge "Merge "Wait for all of associated activities done animating" into rvc-dev am: e873ed32 am: 7904f5a6" into rvc-d1-dev-plus-aosp am: c45b269a

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

Change-Id: Id5268ebc7b76b100d4d4f2934da1fe96f207d89b