DO NOT MERGE Revert all scrim related changes in qpr

This reverts commit 9449cfc4.
This reverts commit 22fa9757.
This reverts commit bde48202.

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 f97d7f73)