Merge "Merge "Ensure that animated key button drawable has callbacks" into rvc-dev am: acf07500 am: 7ba833e3 am: 553bcea3" into rvc-qpr-dev-plus-aosp am: 856418c4

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

Change-Id: Idaad8f82a42fcff740bb69be147dc81886b18e19