DO NOT MERGE Revert all scrim related changes in qpr

This reverts commit 9449cfc4a608e7d801da642958249a16c536411b.
This reverts commit 22fa97577f39524e3ffbfbbf37040eff540bcb49.
This reverts commit bde48202e7bb1ffa04acd5c42a332c62b73f34d8.

Bug: 141649119
Bug: 143195895 is also fixed on my taimen with the above.
Bug: 143185828
Test: atest SystemUITests
Change-Id: I225b10fef2f88d3436ef3a683c09717467b071ad
(cherry picked from commit f97d7f73cf965f30b645ddd01a5f639e7e79d192)
9 files changed