Merge "Revert "Fix ping pong progress in the Kawase implementation."" into main am: 0893c1c3c5 am: 2eba151e2c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3088985

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