Merge "Add test for SystemActivityMonitoringService" into nyc-car-dev