Merge "End transitions when receiving merge request" into tm-qpr-dev am: dfbcd379 am: 05f13a38

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



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