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: 7904f5a6 am: 53ab7d5a

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

Change-Id: Ic82f494fec87491c6644e8ea27aa80dd9e9f9a6b