Merge "Track input shaders java-side for heap tooling" into udc-dev am: 18396b26 am: a849ed59

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



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