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 am: 53ab7d5a" into rvc-qpr-dev-plus-aosp am: 9ed68c0f

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

Change-Id: I37205d7dce4385419b6f6d19eb142d6320f03a9e