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

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

Change-Id: I9315cc4c57f8a04faa38e09989918e905b837070