[automerger skipped] Merge "Remove the redundant parameters in...

[automerger skipped] Merge "Remove the redundant parameters in applyTransactionsLocked" into main am: 6d364318 am: 082fa0a2 -s ours

am skip reason: Merged-In Ic4ded171e90bcfb7a0d58df2c272f4c219be3a04 with SHA-1 a97d59db is already in history

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



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