[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: 5d713e00 am: 8cb6b818 -s ours

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

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

Change-Id: Ic94b99d3bd35f32196e59809f6d1df53b890d0e4