[Sb refactor] address code comments

Address code comments from changes:

Ieaf30071cf2a0082dc005dfc8e8332c0a7456df6
Id57cc4047d9290581e6b8eae813136ebfb8eb3be

Test: atest SystemUITests
Bug: 272784824
Change-Id: I3f3349129a39d754081749bd08ceb65ca57e4e1c
4 files changed