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

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

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