Code review feedback

Minor improvements to clean up some code

Bug: 331748021
Test: atest SystemUITests
Flag: N/A
Change-Id: Ie846d6104e4ef303f655dbc147814ae529b4d0ac
7 files changed