Merge "Avoid excessive KGSL maps" into rvc-dev am: acf8443e9a am: 8713368880

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

Change-Id: I82452882c47fc083f2b2fdc139c41365da02d890