[automerger skipped] Merge "Fix GL memory not being removed from lost RAM"...

[automerger skipped] Merge "Fix GL memory not being removed from lost RAM" into sc-v2-dev am: 99ab01f4 -s ours am: a4fc5503 -s ours

am skip reason: Merged-In I478143e435b047bf349bd4ec6808707a5db1505b with SHA-1 0b7c1774 is already in history

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

Change-Id: I8dd6335e2d2190fdc508b8e45a7d706433f1743f