Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e10 am: 976a90621b am: 9fce1b42c3

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

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