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

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

Change-Id: Id2bcf2c584e0dae6d12bfc7bfc051f5b2fccda79