Revert "am 256fc043: am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"

This reverts commit e02dec8c4cbab17d09983af1328308b8aa61ef85, reversing
changes made to 6d7a052fb04b251c517d0a9049b8d5d7408ce8c0.

Bug: 2798567
14 files changed