Merge "Merge "Ensure that animated key button drawable has callbacks" into...

Merge "Merge "Ensure that animated key button drawable has callbacks" into rvc-dev am: acf07500 am: 9542a56d am: db55bf70" into rvc-qpr-dev-plus-aosp am: 7567a131

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

Change-Id: Ie9171c7d851302308db4fdb9a44a17e32ca2013d