[automerger skipped] Merge "Fix HardwareRenderers becoming invalidated by...

[automerger skipped] Merge "Fix HardwareRenderers becoming invalidated by TRIM" into 24D1-dev am: ff493fd3 -s ours

am skip reason: Merged-In I6b22d202b71effa1a7136a20f51b38732d0fde74 with SHA-1 254972cf is already in history

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



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