8209517c2c
This reverts commit ff2b38e366.
Reason for revert: Caused jank regressions: b/307779813, b/307766171.
Change-Id: I3d513196f9fd8f0768affdda73c0ab8924790037