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

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

Change-Id: I08d5257b3aae17e9ed7a4c01a182735528afb6d2