Merge "Ensure default and remote transition handlers are first" into tm-qpr-dev am: 5d5cae6c

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



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