Merge "Merge "Ensure that animated key button drawable has callbacks" into rvc-dev am: acf0750084 am: 9542a56d6b am: db55bf702d" into rvc-qpr-dev-plus-aosp