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