Nits fix and comment update

Fix some nits from previous CLs and update the comments about the
TrafficController locking design

Bug: 130334320
Bug: 126620214
Test: Build
Change-Id: I9963f1c7944bdd6a759ccc45117aa88720ce6b9f
Merged-In: I9963f1c7944bdd6a759ccc45117aa88720ce6b9f
(cherry picked from commit fd88f9d6f6d8956d00370e66c4a1695ce9577cf5)
2 files changed