Merge "Fix doFadingAnimationLocked in sanitized builds." am: 05284b6c6a am: b327eb682e
am: f74c76e2df  -s ours

Change-Id: I3fe3873a2f05db3ab0e916c90ceb1e280bcd0409