Merge "Add test APIs for makeCustomAnimation" into rvc-dev am: 49ccdb557f

Change-Id: If3c06c4901c8942652a87427391f2812d761979b