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 am: 39d0b53b

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



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