[automerger skipped] Merge "Correct the return value of applyAnimationLocked."...

[automerger skipped] Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev am: af90f3fe am: d58e211d -s ours am: 24a0a25d -s ours

am skip reason: Change-Id I69bcd29f2587a3644485a0db05e622f6775cc82f with SHA-1 48288a50 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12383608

Change-Id: I9e62c8d03c18885e270ffc85824541a5aa9867a6