Merge "Update handler callback to support clean-up aborted transitions" into...

Merge "Update handler callback to support clean-up aborted transitions" into tm-qpr-dev am: 9efd7190

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



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