Merge "Fix GL memory not being removed from lost RAM" am: f7e97bd385 am: 72b5ecdea4

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

Change-Id: I4d09f3cb7698ae89a0fade3b364ef48978916a17