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

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

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



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