Merge "Merge "Ensure that animated key button drawable has callbacks" into rvc-dev am: acf0750084 am: 7ba833e373 am: 553bcea3da" into rvc-qpr-dev-plus-aosp