Follow up for ag/26908611

This addresses some minor comments in ag/26908611. We decided to
submit and fix in a second CL because the original touched a lot of
files and was vulnerable to a prolonged cycle of merge conflicts and
retests if we didn't merge when we could.

Fixes: 333775705
Test: updated and ran affected tests
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Change-Id: I4b05c268acad827c110d041b12979e6e486719ea