Merge "Wait for all of associated activities done animating" into rvc-dev am:...

Merge "Wait for all of associated activities done animating" into rvc-dev am: e873ed32 am: f58dbc9e am: 722a9a5a

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

Change-Id: I37b70efe1cff7fc71d6d2d37672d2bc30914b9ac