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

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



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