This change broke android.uirendering.cts.testclasses.EdgeEffectTests. This reverts commit 6085f8a1. Bug: 64085792 Change-Id: I70ccebebb54dabf1ec0ee5002adca93e44104a1e