Revert "Fixes 'no ripple effect' issue for screen attention setting"

This reverts commit 20d1da2b6298ade2a2390a66f98a1d12381e5e8f.

Reason for revert: Based on bisection, this is the likely root cause of b/186904496

Bug: 186904496
Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6
(cherry picked from commit 30e9ba1e52f072dd73e18cbee10bb6e3adc5b1e0)
5 files changed