[automerger skipped] GpuMem perfetto producer am: bb66c98a am: e32ea4b2 am: 97dacbf0 am: 6b29185f -s ours

am skip reason: Change-Id I5c8278754549399ffa51e6e6fc2ca69b51976cb2 with SHA-1 b9f62d6b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1472017

Change-Id: I130f5c530961f29da722fc330b9c0e4de048eb41