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

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

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



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