Merge "Fixes a race condition when merge animation transition" into tm-qpr-dev...

Merge "Fixes a race condition when merge animation transition" into tm-qpr-dev am: 8f3ab8cb am: 08744d60

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



Change-Id: If73141b9a5c9ea75a33115c03cfc46e5bcaf81e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>