Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e10

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

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