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

This reverts commit 20d1da2b.

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

Bug: 186904496
Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6