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

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

Change-Id: I88f30c1fac5869dca22e0c9df58ab2794ddd75a0