Merge "Attempt to deflake BitmapTests#testChangeDuringRtAnimation"