Merge "Cleanup some SystemService.onUser...() comments"