Merge "Frameworks/base: Move Animation.USE_CLOSEGUARD to inner class" into nyc-dev