Fix lint warnings in ScrimController and ScrimState

These keep getting flagged in the IDE and makes "going to the next issue" in the file slightly more inefficient

Bug: NA
Test: everything builds
Flag: EXEMPT deadcode/warning fixes
Change-Id: Ic19231562007d23c954314d3b48a1758a9b51a4d
3 files changed