Added units for http://ag/3709565. Some refactoring. Test: m -j RunFrameworksServicesRoboTests Bug: 72485465 Change-Id: Id75a4e0b96936580fd677041e091340b0fff8c1e (cherry picked from commit cac3a74059)
cac3a74059