[automerger skipped] avoid resetting mExpectRetrograde when deltaHalPosition == 0 am: dafa723cbb am: 4915dfb86a -s ours

am skip reason: Merged-In I204198b10038101f41b7b417034d05d4430e13be with SHA-1 e93e6cf26b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3083264

Change-Id: Idc7667714da0a0ef39ee210f5956c8e97da79874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>