Merge "Don't abort transition for activity re-ordering." into tm-qpr-dev am: 6fae7ad3

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



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