Merge "Switch to callback animation" am: 51060f3f7a am: 5267d92272

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

Change-Id: I3e4d82a9a2f9e9f4f1232a2de21a55cc19a2168a