Merge "Remove extra dispatch variable" into main am: 7fa9bb98cb

Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/3521633

Change-Id: I6d73bf75181d3ee79c485f57172cf1fd21b39157
Signed-off-by: Automerger Merge Worker <[email protected]>