9d7b814eec
This reverts commit 3ccfdbf6c4.
Reason for revert: Droidmonitor created revert due to Jank regression b/413244466.
Change-Id: I09276810e3611b54526ed3d2af7a35949a412b0c