21/n: Clean up ClientMonitor parameters

Bug: 157790417

Test: Builds
Change-Id: Ie5dcef72f623dd0efe1764af826c29a9d706e6c8
22 files changed