Clean up the multi-client ror code

Address some comments on the 1st cl.

Bug: 170664917
Test: aest FrameworksServicesTests:RecoverySystemServiceTest
Change-Id: I0a509454f5d86a56373f2126d1ef8bdf028cecdb
1 file changed