Merge "Switch to callback animation" am: 51060f3f7a

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

Change-Id: I48d71f9f156430fc62016e2cdc8fcd2498a3363b