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

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

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